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

Restored the old editor terrain scrolling behaviour.

Browse source
This commit is contained in:
Fabian Müller 2012-03-05 16:43:50 +00:00
parent 740bf3d9d8
commit 1e2ab67f73
3 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/themes/editor.cfg
View file

@ -268,8 +268,6 @@
yanchor=fixed
[/menu]
#Second Row.
[menu]
id=flood_button_editor
@ -573,7 +571,6 @@
[/position]
[terrain]
id=status-terrain
# font_size={DEFAULT_EDITOR_FONT_TINY}
ref=terrain-panel
font_size={DEFAULT_EDITOR_FONT_SMALL}
#rect="=+115,=,=-24,="
@ -584,9 +581,9 @@
[/status]
[menu]
id=leftscroll-button-editor
image=left_arrow-button
items=editor-terrain-leftscroll
id=upscroll-button-editor
image=uparrow-button
items=editor-terrain-upscroll
ref=terrain_image
rect="+6,=+0,+24,+24"
xanchor=right
@ -594,10 +591,10 @@
[/menu]
[menu]
id=rightscroll-button-editor
image=right_arrow-button
items=editor-terrain-rightscroll
ref=leftscroll-button-editor
id=downscroll-button-editor
image=downarrow-button
items=editor-terrain-downscroll
ref=upscroll-button-editor
rect="+6,=+0,+24,+24"
xanchor=right
yanchor=fixed

32
src/editor/editor_palettes.cpp
View file

@ -199,26 +199,22 @@ void terrain_palette::adjust_size() {
}
void terrain_palette::scroll_right() {
unsigned int rows = (size_specs_.palette_h / size_specs_.terrain_space);
if(tstart_ + nterrains_ + rows <= num_terrains()) {
tstart_ += rows;
if(tstart_ + nterrains_ + size_specs_.terrain_width <= num_terrains()) {
tstart_ += size_specs_.terrain_width;
bg_restore();
set_dirty();
}
else if (tstart_ + nterrains_ + (num_terrains() % rows) <= num_terrains()) {
tstart_ += num_terrains() % rows;
else if (tstart_ + nterrains_ + (num_terrains() % size_specs_.terrain_width) <= num_terrains()) {
tstart_ += num_terrains() % size_specs_.terrain_width;
bg_restore();
set_dirty();
}
}
void terrain_palette::scroll_left() {
unsigned int rows = (size_specs_.palette_h / size_specs_.terrain_space);
unsigned int decrement = rows;
if (tstart_ + nterrains_ == num_terrains() && num_terrains() % rows != 0) {
decrement = num_terrains() % rows;
unsigned int decrement = size_specs_.terrain_width;
if (tstart_ + nterrains_ == num_terrains() && num_terrains() % size_specs_.terrain_width != 0) {
decrement = num_terrains() % size_specs_.terrain_width;
}
if(tstart_ >= decrement) {
bg_restore();
@ -342,12 +338,10 @@ void terrain_palette::handle_event(const SDL_Event& event) {
if (mouse_button_event.button == SDL_BUTTON_WHEELLEFT) {
set_group( (active_group_index() -1) % (terrain_groups_.size() -1));
gui_.set_terrain_report(active_terrain_report());
// gui_.redraw_everything();
}
if (mouse_button_event.button == SDL_BUTTON_WHEELRIGHT) {
set_group( (active_group_index() +1) % (terrain_groups_.size() -1));
gui_.set_terrain_report(active_terrain_report());
// gui_.redraw_everything();
}
}
if (mouse_button_event.type == SDL_MOUSEBUTTONUP) {
@ -367,7 +361,7 @@ void terrain_palette::draw(bool force) {
ending = num_terrains();
}
const SDL_Rect &loc = location();
int x = loc.x;
int y = terrain_start_;
SDL_Rect palrect;
palrect.x = loc.x;
palrect.y = terrain_start_;
@ -380,10 +374,8 @@ void terrain_palette::draw(bool force) {
const int counter_from_zero = counter - starting;
SDL_Rect dstrect;
dstrect.x = x;
// dstrect.y = terrain_start_ + (counter_from_zero % size_specs_.terrain_width) * size_specs_.terrain_space;
// (counter_from_zero % size_specs_.terrain_width == size_specs_.terrain_width - 1)
dstrect.y = terrain_start_ + (counter_from_zero % (palrect.h /size_specs_.terrain_space) ) * size_specs_.terrain_space;
dstrect.x = loc.x + (counter_from_zero % size_specs_.terrain_width) * size_specs_.terrain_space;
dstrect.y = y;
dstrect.w = size_specs_.terrain_size;
dstrect.h = size_specs_.terrain_size;
@ -472,8 +464,8 @@ void terrain_palette::draw(bool force) {
<< "</span>";
}
tooltips::add_tooltip(dstrect, tooltip_text.str());
if ( (counter_from_zero +1) % ( palrect.h / size_specs_.terrain_space ) == 0)
x += size_specs_.terrain_space;
if (counter_from_zero % size_specs_.terrain_width == size_specs_.terrain_width - 1)
y += size_specs_.terrain_space;
}
update_rect(loc);
set_dirty(false);

4
src/hotkeys.cpp
View file

@ -133,8 +133,8 @@ const struct {
{ hotkey::HOTKEY_EDITOR_TERRAIN_PALETTE_SWAP, "editor-terrain-palette-swap",
N_("Swap Foreground/Background Terrains"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TERRAIN_GROUPS, "editor-terrain-groups", N_("Change Terrain Group"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TERRAIN_LEFTSCROLL, "editor-terrain-leftscroll", N_("Scroll Terrains Left"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TERRAIN_RIGHTSCROLL, "editor-terrain-rightscroll", N_("Scroll Terrains Right"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TERRAIN_LEFTSCROLL, "editor-terrain-upscroll", N_("Scroll Terrains Left"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TERRAIN_RIGHTSCROLL, "editor-terrain-downscroll", N_("Scroll Terrains Right"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TOOL_NEXT, "editor-tool-next", N_("Next Tool"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TOOL_PAINT, "editor-tool-paint", N_("Paint Tool"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TOOL_FILL, "editor-tool-fill", N_("Fill Tool"), false, hotkey::SCOPE_EDITOR },