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

Fixup 03c7b3d

Browse source 
* Cleaner variable set method
* Fix variable name
This commit is contained in:
Charles Dang 2017-04-08 15:17:49 +11:00
parent 03c7b3debd
commit 3a3e6fe725
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/gui/widget/panel_story_viewer.cfg
View file

@ -29,7 +29,7 @@
x = 0
y = {OFFSET_SIDE_1}
w = "(width)"
h = "(if(height < {OFFSET_TOTAL}, 0, height - if(panel_mode != 'bottom', {OFFSET_SIDE_2}, 0)))"
h = "(if(height < {OFFSET_TOTAL}, 0, height - if(panel_position != 'bottom', {OFFSET_SIDE_2}, 0)))"
name = "dialogs/" + {_GUI_BASE_NAME} + "-background.png"
[/image]
@ -38,7 +38,7 @@
y = 0
w = "(width)"
resize_mode = "stretch"
name = "(if(panel_position != 'top' or title_present = 'yes', 'dialogs/" + {_GUI_BASE_NAME} + "-border-top.png', ''))"
name = "(if(panel_position != 'top' or title_present, 'dialogs/" + {_GUI_BASE_NAME} + "-border-top.png', ''))"
[/image]
[image]

2
src/gui/dialogs/story_viewer.cpp
View file

@ -251,7 +251,7 @@ void story_viewer::display_part(window& window)
canvas& panel_canvas = find_widget<panel>(text_stack.get_layer_grid(1), "text_panel", false).get_canvas(0);
panel_canvas.set_variable("panel_position", wfl::variant(new_panel_mode));
panel_canvas.set_variable("title_present", wfl::variant(showing_title ? "yes" : "no")); // TODO: bool variant
panel_canvas.set_variable("title_present", wfl::variant(static_cast<int>(showing_title))); // cast to 0/1
const std::string& part_text = current_part_->text();