Story Viewer: progress on key nav and background image rendering

data/gui/window/story_viewer.cfg

@@ -1,5 +1,15 @@
 #textdomain wesnoth-lib
 
+#define _GUI_BUFFER
+	[column]
+
+		[spacer]
+			width = 10
+		[/spacer]
+
+	[/column]
+#enddef
+
 #define _GUI_TEXT_PANEL
 	[panel]
 		id = "text_panel"
@@ -10,6 +20,8 @@
 			[row]
 				grow_factor = 0
 
+				{_GUI_BUFFER}
+
 				[column]
 					grow_factor = 1
 					border = "all"
@@ -33,11 +45,11 @@
 
 					[grid]
 
-						# TODO: proper layout
+						# TODO: proper left/right buttons
 						[row]
 
 							[column]
-								border = "all"
+								border = "left,right,top"
 								border_size = 10
 
 								[button]
@@ -53,7 +65,7 @@
 						[row]
 
 							[column]
-								border = "all"
+								border = "left,right"
 								border_size = 10
 
 								[button]
@@ -84,9 +96,10 @@
 
 					[/grid]
 
-
 				[/column]
 
+				{_GUI_BUFFER}
+
 			[/row]
 
 		[/grid]
@@ -100,6 +113,12 @@
 
 	[resolution]
 
+		# TODO: consider if we should use these
+		#left_border = 10
+		#right_border = 13
+		#top_border = 10
+		#bottom_border = 13
+
 		[background]
 
 			[draw]
@@ -111,17 +130,12 @@
 					h = "(height)"
 
 					fill_color = "0, 0, 0, 255"
+
+					# The canvas is constantly getting reset in order to add the background
+					# images, but we want to keep the black background.
+					immutable = true
 				[/rectangle]
 
-				[image]
-					x = 0
-					y = 0
-					w = "(width)"
-					h = "(height)"
-
-					name = "(background_image)"
-				[/image]
-
 			[/draw]
 
 		[/background]
@@ -168,15 +182,15 @@
 		[grid]
 
 			[row]
+				grow_factor = 0
 
 				[column]
 					grow_factor = 1
-					border = "all"
-					border_size = 5
 					horizontal_grow = true
+					vertical_grow = true
 
 					[label]
-						definition = "title"
+						definition = "default_large"
 						id = "title"
 						label = "Placeholder text"
 					[/label]
@@ -185,6 +199,7 @@
 			[/row]
 
 			[row]
+				grow_factor = 1
 
 				[column]
 					grow_factor = 1
@@ -203,3 +218,6 @@
 	[/resolution]
 
 [/window]
+
+#undef _GUI_TEXT_PANEL
+#undef _GUI_BUFFER

src/gui/dialogs/story_viewer.cpp

@@ -45,7 +45,7 @@ void story_viewer::pre_show(window& window)
 {
 	window.set_enter_disabled(true);
 
-	// Special callback to make Enter advance to the next part.
+	// Special callback handle key presses
 	connect_signal_pre_key_press(window, std::bind(&story_viewer::key_press_callback, this, std::ref(window), _5));
 
 	connect_signal_mouse_left_click(find_widget<button>(&window, "next", false),
@@ -64,16 +64,36 @@ void story_viewer::update_current_part_ptr()
 
 void story_viewer::display_part(window& window)
 {
-	// TODO: handle all layers
-	const std::string bg = current_part_->get_background_layers()[0].file();
+	// Update Back button state. Doing this here so it gets called in pre_show too.
+	find_widget<button>(&window, "back", false).set_active(part_index_ != 0);
 
-   	window.get_canvas(0).set_variable("background_image", variant(bg));
+	config cfg, shape;
 
-	find_widget<label>(&window, "title", false).set_label(current_part_->title());
-	find_widget<label>(&window, "part_text", false).set_label(current_part_->text());
+	for(const auto& layer : current_part_->get_background_layers()) {
+		//SDL_Rect image_rect;
+
+		shape["x"] = "(max(pos, 0) where pos = (width  / 2 - image_width  / 2))";
+		shape["y"] = "(max(pos, 0) where pos = (height / 2 - image_height / 2))";
+		shape["w"] = "(image_original_width * height / image_original_height)";
+		shape["h"] = "(height)";
+		shape["name"] = layer.file();
+
+		cfg.add_child("image", shape);
+	}
+
+	canvas& window_canvas = window.get_canvas(0);
+
+	window_canvas.set_cfg(cfg);
 
 	// Needed to make the background redraw correctly.
+	window_canvas.set_is_dirty(true);
 	window.set_is_dirty(true);
+
+	// FIXME: seems if the label doesn't have *something* in it each time its set, the label will never show up.
+	const std::string title = current_part_->title().empty() ? " " : current_part_->title();
+	find_widget<label>(&window, "title", false).set_label(title);
+
+	find_widget<label>(&window, "part_text", false).set_label(current_part_->text());
 }
 
 void story_viewer::nav_button_callback(window& window, NAV_DIRECTION direction)
@@ -90,8 +110,6 @@ void story_viewer::nav_button_callback(window& window, NAV_DIRECTION direction)
 		part_index_ = 0;
 	}
 
-	// TODO: disable buttons
-
 	update_current_part_ptr();
 
 	display_part(window);
@@ -99,8 +117,20 @@ void story_viewer::nav_button_callback(window& window, NAV_DIRECTION direction)
 
 void story_viewer::key_press_callback(window& window, const SDL_Keycode key)
 {
-	if(key == SDLK_RETURN) {
+	const bool next_keydown =
+		   key == SDLK_SPACE
+		|| key == SDLK_RETURN
+		|| key == SDLK_KP_ENTER
+		|| key == SDLK_RIGHT;
+
+	const bool back_keydown =
+		   key == SDLK_BACKSPACE
+		|| key == SDLK_LEFT;
+
+	if(next_keydown) {
 		nav_button_callback(window, DIR_FORWARD);
+	} else if(back_keydown) {
+		nav_button_callback(window, DIR_BACKWARDS);
 	}
 }
 

src/storyscreen/interface.cpp

@@ -46,6 +46,10 @@ void show_story(CVideo& video, const std::string &scenario_name,
 			cfg.append_children(iter);
 		}
 
+		if(!cfg.has_child("part")) {
+			return;
+		}
+
 		storyscreen::controller controller(video, vconfig(cfg, true), scenario_name, 0);
 
 		gui2::dialogs::story_viewer::display(controller, video);