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

Improve the switch zoom toggle:

Browse source 
now the default zoom key switch between default and last used zoom
(initialized with half the default zoom but use 16 instead of 18 for
tiny-gui, to keep the multiplicity by 4) So, now you can also have a
big fast zoom on fights if you want.
This commit is contained in:
Ali El Gariani 2007-08-17 05:09:18 +00:00
parent 8c4311d491
commit fd117b4a9d
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/display.cpp
View file

@ -47,8 +47,10 @@
namespace {
#ifdef USE_TINY_GUI
const int DefaultZoom = 36;
const int SmallZoom = 16;
#else
const int DefaultZoom = 72;
const int SmallZoom = 36;
#endif
const int MinZoom = 4;
@ -62,7 +64,8 @@ namespace {
display::display(CVideo& video, const gamemap& map, const config& theme_cfg, const config& cfg, const config& level) :
screen_(video), map_(map), viewpoint_(NULL), xpos_(0), ypos_(0),
theme_(theme_cfg,screen_area()), zoom_(DefaultZoom),
theme_(theme_cfg,screen_area()),
zoom_(DefaultZoom), last_zoom_(SmallZoom),
builder_(cfg, level, map, theme_.border().tile_image),
minimap_(NULL), redrawMinimap_(false), redraw_background_(true),
invalidateAll_(true), grid_(false),
@ -1279,11 +1282,13 @@ void display::set_zoom(int amount)
void display::set_default_zoom()
{
if (zoom_ != DefaultZoom) {
last_zoom_ = zoom_;
set_zoom(DefaultZoom - zoom_ );
} else {
// we are already at the default zoom
// so switch to the second default (strategic view)
set_zoom(DefaultZoom / 2 - zoom_);
// when we are already at the default zoom
// switch to the last zoom used
set_zoom(last_zoom_ - zoom_);
last_zoom_ = DefaultZoom;
}
}

1
src/display.hpp
View file

@ -364,6 +364,7 @@ protected:
int xpos_, ypos_;
theme theme_;
int zoom_;
int last_zoom_;
terrain_builder builder_;
surface minimap_;
bool redrawMinimap_;