0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed image::set_zoom

Browse source 
Unused
This commit is contained in:
Charles Dang 2022-11-04 18:56:07 -04:00
parent 9efc202d33
commit 0f47405a96
3 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/display.cpp
View file

@ -247,8 +247,6 @@ display::display(const display_context* dc,
if(zoom_ != preferences::tile_size()) // correct saved tile_size if necessary if(zoom_ != preferences::tile_size()) // correct saved tile_size if necessary
preferences::set_tile_size(zoom_); preferences::set_tile_size(zoom_);
image::set_zoom(zoom_);
init_flags(); init_flags();
if(!menu_buttons_.empty() || !action_buttons_.empty()) { if(!menu_buttons_.empty() || !action_buttons_.empty()) {
@ -1936,7 +1934,6 @@ bool display::set_zoom(unsigned int amount, const bool validate_value_and_set_in
} }
preferences::set_tile_size(zoom_); preferences::set_tile_size(zoom_);
image::set_zoom(zoom_);
labels().recalculate_labels(); labels().recalculate_labels();
redraw_background_ = true; redraw_background_ = true;
@ -2211,8 +2208,6 @@ void display::scroll_to_tiles(const std::vector<map_location>::const_iterator &
void display::bounds_check_position() void display::bounds_check_position()
{ {
const unsigned int orig_zoom = zoom_;
if(zoom_ < MinZoom) { if(zoom_ < MinZoom) {
zoom_ = MinZoom; zoom_ = MinZoom;
} }
@ -2222,10 +2217,6 @@ void display::bounds_check_position()
} }
bounds_check_position(xpos_, ypos_); bounds_check_position(xpos_, ypos_);
if(zoom_ != orig_zoom) {
image::set_zoom(zoom_);
}
} }
void display::bounds_check_position(int& xpos, int& ypos) const void display::bounds_check_position(int& xpos, int& ypos) const

8
src/picture.cpp
View file

@ -197,8 +197,6 @@ std::set<std::string> precached_dirs;
int red_adjust = 0, green_adjust = 0, blue_adjust = 0; int red_adjust = 0, green_adjust = 0, blue_adjust = 0;
unsigned int zoom = tile_size;
const std::string data_uri_prefix = "data:"; const std::string data_uri_prefix = "data:";
struct parsed_data_URI{ struct parsed_data_URI{
explicit parsed_data_URI(std::string_view data_URI); explicit parsed_data_URI(std::string_view data_URI);
@ -759,12 +757,6 @@ void set_color_adjustment(int r, int g, int b)
} }
} }
void set_zoom(unsigned int amount)
{
// This no longer has to do anything fancy.
zoom = amount;
}
static surface get_hexed(const locator& i_locator, bool skip_cache = false) static surface get_hexed(const locator& i_locator, bool skip_cache = false)
{ {
surface image(get_surface(i_locator, UNSCALED, skip_cache)); surface image(get_surface(i_locator, UNSCALED, skip_cache));

8
src/picture.hpp
View file

@ -222,14 +222,6 @@ struct manager
*/ */
void set_color_adjustment(int r, int g, int b); void set_color_adjustment(int r, int g, int b);
/**
* Sets the scaling factor for images.
*
* Changing the previous value automatically invalidates all cached scaled
* images.
*/
void set_zoom(unsigned int zoom);
/** /**
* Used to specify the rendering format of images. * Used to specify the rendering format of images.
*/ */