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

Story Viewer: much progress

Browse source 
Most functionality is implemented now, except (most notably) floating images.
This commit is contained in:
Charles Dang 2017-03-28 01:06:42 +11:00
parent 6bb7bd1017
commit 396b33c8a9
3 changed files with 151 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
data/gui/window/story_viewer.cfg
View file

@ -1,16 +1,6 @@
#textdomain wesnoth-lib
#define _GUI_BUFFER
[column]
[spacer]
width = 10
[/spacer]
[/column]
#enddef
#define _GUI_TEXT_PANEL
#define _GUI_MAIN_STACK
[stacked_widget]
id = "text_and_control_stack"
@ -27,41 +17,9 @@
id = "text_panel"
definition = "wml_message"
# This panel isn't meant to have any contents.
# It simply serves as the background.
[grid]
[row]
grow_factor = 0
{_GUI_BUFFER}
[column]
grow_factor = 1
border = "all"
border_size = 10
horizontal_grow = true
vertical_grow = true
[scroll_label]
definition = "default"
id = "part_text"
use_markup = true
[/scroll_label]
[/column]
{_GUI_BUFFER}
# Reserve space equal to the size of the controls area.
[column]
grow_factor = 0
[spacer]
linked_group = "controls"
[/spacer]
[/column]
[/row]
[/grid]
[/panel]
@ -75,21 +33,37 @@
[layer]
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 20
horizontal_grow = true
vertical_grow = true
[scroll_label]
definition = "default"
id = "part_text"
use_markup = true
[/scroll_label]
[/column]
[column]
grow_factor = 0
horizontal_grow = true
vertical_alignment = "bottom"
[grid]
linked_group = "controls"
# TODO: proper left/right buttons
[row]
[column]
border = "left,right,top"
border_size = 10
border_size = 20
horizontal_alignment = "right"
[button]
@ -106,7 +80,7 @@
[column]
border = "left,right"
border_size = 10
border_size = 20
horizontal_alignment = "right"
[button]
@ -123,7 +97,7 @@
[column]
border = "all"
border_size = 10
border_size = 20
horizontal_alignment = "right"
[button]
@ -140,8 +114,6 @@
[/column]
{_GUI_BUFFER}
[/row]
[/layer]
@ -150,16 +122,13 @@
#enddef
[window_definition]
id = "storyscreen"
id = "story_viewer_window"
description = "The window definition for the story screen."
[resolution]
# TODO: consider if we should use these
#left_border = 10
#right_border = 13
#top_border = 10
#bottom_border = 13
# NOTE: we don't specify borders like most definitions since we want
# widgets to fully reach the edge of the window.
[background]
@ -199,7 +168,7 @@
description = "Story screen browser"
[resolution]
definition = "storyscreen"
definition = "story_viewer_window"
{GUI_WINDOW_FULLSCREEN}
@ -211,21 +180,6 @@
id = "tooltip_large"
[/helptip]
[linked_group]
id = "images"
fixed_width = true
[/linked_group]
[linked_group]
id = "names"
fixed_width = true
[/linked_group]
[linked_group]
id = "controls"
fixed_width = true
[/linked_group]
[grid]
[row]
@ -233,6 +187,8 @@
[column]
grow_factor = 1
border = "all"
border_size = 20
horizontal_grow = true
vertical_grow = true
@ -240,7 +196,9 @@
definition = "default_large"
id = "title"
label = "Placeholder text"
use_markup = true
[/label]
[/column]
[/row]
@ -254,7 +212,7 @@
vertical_alignment = "bottom"
{GUI_FORCE_WIDGET_MINIMUM_SIZE 0 ("(screen_height / 4)") (
{_GUI_TEXT_PANEL}
{_GUI_MAIN_STACK}
)}
[/column]
@ -266,5 +224,4 @@
[/window]
#undef _GUI_TEXT_PANEL
#undef _GUI_BUFFER
#undef _GUI_MAIN_STACK

BIN
images/dialogs/story_title_decor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

@ -18,6 +18,7 @@
#include "formula/variant.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/point.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/scroll_label.hpp"
@ -30,6 +31,37 @@ namespace gui2
namespace dialogs
{
// TODO: change the internal part handling to either use PangoAlignment or plain strings
// once the GUI1 screen is dropped.
static PangoAlignment storyscreen_alignment_to_pango(const storyscreen::part::TEXT_ALIGNMENT alignment)
{
PangoAlignment text_alignment = PANGO_ALIGN_LEFT;
switch(alignment) {
case storyscreen::part::TEXT_CENTERED:
text_alignment = PANGO_ALIGN_CENTER;
break;
case storyscreen::part::TEXT_RIGHT:
text_alignment = PANGO_ALIGN_RIGHT;
break;
default:
break; // already set before
}
return text_alignment;
}
#if 0
static panel* get_new_panel(const std::string& definition)
{
panel* panel_ptr = new panel();
panel_ptr->set_definition(definition);
panel_ptr->set_id("text_panel");
return panel_ptr;
}
#endif
REGISTER_DIALOG(story_viewer)
story_viewer::story_viewer(storyscreen::controller& controller)
@ -68,7 +100,14 @@ void story_viewer::display_part(window& window)
config cfg, image;
//
// Background images
//
bool has_background = false;
for(const auto& layer : current_part_->get_background_layers()) {
has_background |= !layer.file().empty();
const bool preserve_ratio = layer.keep_aspect_ratio();
// By default, no scaling will be applied.
@ -105,6 +144,17 @@ void story_viewer::display_part(window& window)
cfg.add_child("image", image);
}
image.clear();
// TODO: should this be in the WML?
image["x"] = 0;
image["y"] = 0;
image["w"] = "(screen_width)";
image["h"] = "(image_original_height * 2)";
image["name"] = "dialogs/story_title_decor.png";
cfg.add_child("image", image);
canvas& window_canvas = window.get_canvas(0);
window_canvas.set_cfg(cfg);
@ -113,23 +163,78 @@ void story_viewer::display_part(window& window)
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);
//
// Title
//
std::string title;
if(current_part_->show_title() && !current_part_->title().empty()) {
title = current_part_->title();
} else {
// FIXME: seems if the label doesn't have *something* in it each time its set, the label will never show up.
title = " ";
}
const std::string& part_text = current_part_->text();
PangoAlignment title_text_alignment = storyscreen_alignment_to_pango(current_part_->title_text_alignment());
label& title_label = find_widget<label>(&window, "title", false);
title_label.set_text_alignment(title_text_alignment);
title_label.set_label(title);
//
// Story text
//
stacked_widget& text_stack = find_widget<stacked_widget>(&window, "text_and_control_stack", false);
if(part_text.empty()) {
// No text for this part, hide the text layer.
text_stack.select_layer(1);
} else {
// If the text panel was previously hidden, re-show it.
if(text_stack.current_layer() != -1) {
text_stack.select_layer(-1);
}
//std::string new_definition;
gui2::point new_origin;
find_widget<scroll_label>(&window, "part_text", false).set_label(part_text);
switch(current_part_->story_text_location()) {
case storyscreen::part::BLOCK_TOP:
//new_definition = "wml_message_top";
// Default 0,0 origin value is correct.
break;
case storyscreen::part::BLOCK_MIDDLE:
//new_definition = "wml_message_center";
new_origin.y = (window.get_size().y / 2) - (text_stack.get_size().y / 2);
break;
case storyscreen::part::BLOCK_BOTTOM:
//new_definition = "wml_message";
new_origin.y = window.get_size().y - text_stack.get_size().y;
break;
}
// FIXME: sometimes the text won't appear after a move...
text_stack.set_origin(new_origin);
// TODO
//delete text_stack.get_layer_grid(0)->swap_child("text_panel", get_new_panel(new_definition), true);
const std::string& part_text = current_part_->text();
if(part_text.empty() || !has_background) {
// No text or no background for this part, hide the background layer.
text_stack.select_layer(1);
} else if(text_stack.current_layer() != -1) {
// If the background layer was previously hidden, re-show it.
text_stack.select_layer(-1);
}
// Convert the story part text alignment types into the Pango equivalents
PangoAlignment story_text_alignment = storyscreen_alignment_to_pango(current_part_->story_text_alignment());
scroll_label& text_label = find_widget<scroll_label>(&window, "part_text", false);
text_label.set_text_alignment(story_text_alignment);
text_label.set_label(part_text);
//
// Floating images (handle this last)
//
for(const auto& floating_image : current_part_->get_floating_images()) {
UNUSED(floating_image);
image.clear();
}
}