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

Don't reset zoom level every time a game is loaded (FR #25592)

Browse source 
Note this doesn't apply across app sessions, but it's an improvement.
This commit is contained in:
Charles Dang 2017-03-19 05:15:25 +11:00
parent 64a369ef6f
commit daefe8e63b
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/display.cpp
View file

@ -78,6 +78,7 @@ namespace {
bool debug_foreground = false;
}
unsigned int display::zoom_ = DefaultZoom;
unsigned int display::last_zoom_ = SmallZoom;
void display::parse_team_overlays()
@ -143,9 +144,6 @@ void display::remove_single_overlay(const map_location& loc, const std::string&
}
}
display::display(const display_context * dc, CVideo& video, std::weak_ptr<wb::manager> wb, reports & reports_object, const config& theme_cfg, const config& level, bool auto_join) :
video2::draw_layering(auto_join),
dc_(dc),
@ -160,7 +158,6 @@ display::display(const display_context * dc, CVideo& video, std::weak_ptr<wb::ma
ypos_(0),
view_locked_(false),
theme_(theme_cfg, screen_area()),
zoom_(DefaultZoom),
zoom_index_(0),
fake_unit_man_(new fake_unit_manager(*this)),
builder_(new terrain_builder(level, &dc_->map(), theme_.border().tile_image)),

2
src/display.hpp
View file

@ -724,7 +724,7 @@ protected:
int xpos_, ypos_;
bool view_locked_;
theme theme_;
unsigned int zoom_;
static unsigned int zoom_;
int zoom_index_;
static unsigned int last_zoom_;
const std::unique_ptr<fake_unit_manager> fake_unit_man_;