From 7c85ab11e840c281a2499dcc6dd3219c33e7d37f Mon Sep 17 00:00:00 2001 From: hop311 Date: Thu, 15 Aug 2024 00:13:54 +0100 Subject: Add GUITextLabel (colour code + currency icon support) --- .../NationManagementScreen/PopulationMenu.gd | 50 ++++++++++------------ 1 file changed, 22 insertions(+), 28 deletions(-) (limited to 'game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd') diff --git a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd index ad15fbb..92ae6e2 100644 --- a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd +++ b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd @@ -14,8 +14,8 @@ var _province_list_types : Array[MenuSingleton.ProvinceListEntry] var _province_list_indices : PackedInt32Array var _province_list_panels : Array[Panel] var _province_list_button_icons : Array[GFXSpriteTexture] -var _province_list_name_labels : Array[Label] -var _province_list_size_labels : Array[Label] +var _province_list_name_labels : Array[GUITextLabel] +var _province_list_size_labels : Array[GUITextLabel] var _province_list_growth_icons : Array[GFXSpriteTexture] var _province_list_colony_buttons : Array[Button] var _province_list_national_focus_icons : Array[GFXSpriteTexture] @@ -33,19 +33,19 @@ var _pop_list_scrollbar : GUIScrollbar var _pop_list_scroll_index : int = 0 var _pop_list_rows : Array[Panel] -var _pop_list_size_labels : Array[Label] +var _pop_list_size_labels : Array[GUITextLabel] var _pop_list_type_buttons : Array[Button] var _pop_list_type_icons : Array[GFXSpriteTexture] var _pop_list_producing_icons : Array[GFXSpriteTexture] -var _pop_list_culture_labels : Array[Label] +var _pop_list_culture_labels : Array[GUITextLabel] var _pop_list_religion_icons : Array[GFXSpriteTexture] -var _pop_list_location_labels : Array[Label] -var _pop_list_militancy_labels : Array[Label] -var _pop_list_consciousness_labels : Array[Label] +var _pop_list_location_labels : Array[GUITextLabel] +var _pop_list_militancy_labels : Array[GUITextLabel] +var _pop_list_consciousness_labels : Array[GUITextLabel] var _pop_list_ideology_charts : Array[GFXPieChartTexture] var _pop_list_issues_charts : Array[GFXPieChartTexture] var _pop_list_unemployment_progressbars : Array[TextureProgressBar] -var _pop_list_cash_labels : Array[Label] +var _pop_list_cash_labels : Array[GUITextLabel] var _pop_list_life_needs_progressbars : Array[TextureProgressBar] var _pop_list_everyday_needs_progressbars : Array[TextureProgressBar] var _pop_list_luxury_needs_progressbars : Array[TextureProgressBar] @@ -58,7 +58,7 @@ var _pop_list_political_movement_icons : Array[GFXSpriteTexture] var _pop_list_national_movement_texture_rects : Array[TextureRect] var _pop_list_national_movement_flags : Array[GFXMaskedFlagTexture] var _pop_list_size_change_icons : Array[GFXSpriteTexture] -var _pop_list_literacy_labels : Array[Label] +var _pop_list_literacy_labels : Array[GUITextLabel] func _ready() -> void: GameSingleton.gamestate_updated.connect(_update_info) @@ -142,9 +142,9 @@ func _generate_province_list_row(index : int, type : MenuSingleton.ProvinceListE ) _province_list_button_icons[index] = GUINode.get_gfx_sprite_texture_from_node(base_button) - _province_list_name_labels[index] = GUINode.get_label_from_node(entry_panel.get_node(^"./poplist_name")) + _province_list_name_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_name")) - _province_list_size_labels[index] = GUINode.get_label_from_node(entry_panel.get_node(^"./poplist_numpops")) + _province_list_size_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_numpops")) _province_list_growth_icons[index] = GUINode.get_gfx_sprite_texture_from_node(entry_panel.get_node(^"./growth_indicator")) @@ -273,9 +273,9 @@ func _setup_distribution_windows() -> void: _pop_screen_panel.add_child(distribution_panel) distribution_panel.set_position(distribution_start + distribution_step * Vector2(index % columns, index / columns)) - var name_label : Label = GUINode.get_label_from_node(distribution_panel.get_node(^"./item_name")) + var name_label : GUITextLabel = GUINode.get_gui_text_label_from_node(distribution_panel.get_node(^"./item_name")) if name_label: - name_label.text = distribution_names[index] + name_label.set_text(distribution_names[index]) distribution_chart = GUINode.get_gfx_pie_chart_texture_from_node(distribution_panel.get_node(^"./chart")) distribution_list = GUINode.get_gui_listbox_from_node(distribution_panel.get_node(^"./member_names")) @@ -318,7 +318,7 @@ func _setup_pop_list() -> void: height += pop_row_panel.size.y _pop_list_rows.push_back(pop_row_panel) - _pop_list_size_labels.push_back(GUINode.get_label_from_node(pop_row_panel.get_node(^"./pop_size"))) + _pop_list_size_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_size"))) var pop_type_button : Button = GUINode.get_button_from_node(pop_row_panel.get_node(^"./pop_type")) # TODO - open pop details menu on pop type button press @@ -328,21 +328,17 @@ func _setup_pop_list() -> void: _pop_list_producing_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_producing_icon"))) - var culture_label : Label = GUINode.get_label_from_node(pop_row_panel.get_node(^"./pop_nation")) - if culture_label: - culture_label.set_text_overrun_behavior(TextServer.OVERRUN_TRIM_ELLIPSIS) + var culture_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_nation")) _pop_list_culture_labels.push_back(culture_label) _pop_list_religion_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_religion"))) - var location_label : Label = GUINode.get_label_from_node(pop_row_panel.get_node(^"./pop_location")) - if location_label: - location_label.set_text_overrun_behavior(TextServer.OVERRUN_TRIM_ELLIPSIS) + var location_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_location")) _pop_list_location_labels.push_back(location_label) - _pop_list_militancy_labels.push_back(GUINode.get_label_from_node(pop_row_panel.get_node(^"./pop_mil"))) + _pop_list_militancy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_mil"))) - _pop_list_consciousness_labels.push_back(GUINode.get_label_from_node(pop_row_panel.get_node(^"./pop_con"))) + _pop_list_consciousness_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_con"))) _pop_list_ideology_charts.push_back(GUINode.get_gfx_pie_chart_texture_from_node(pop_row_panel.get_node(^"./pop_ideology"))) @@ -350,7 +346,7 @@ func _setup_pop_list() -> void: _pop_list_unemployment_progressbars.push_back(GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./pop_unemployment_bar"))) - _pop_list_cash_labels.push_back(GUINode.get_label_from_node(pop_row_panel.get_node(^"./pop_cash"))) + _pop_list_cash_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_cash"))) var pop_list_life_needs_progressbar : TextureProgressBar = GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./lifeneed_progress")) if pop_list_life_needs_progressbar: @@ -394,7 +390,7 @@ func _setup_pop_list() -> void: _pop_list_size_change_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./growth_indicator"))) - _pop_list_literacy_labels.push_back(GUINode.get_label_from_node(pop_row_panel.get_node(^"./pop_literacy"))) + _pop_list_literacy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_literacy"))) func _notification(what : int) -> void: match what: @@ -462,7 +458,6 @@ func _update_province_list(scroll_index : int = -1) -> void: GUINode.format_province_name(province_list_info[name_key]) if type == MenuSingleton.LIST_ENTRY_PROVINCE else province_list_info[name_key] ) - _province_list_name_labels[index].set_text_overrun_behavior(TextServer.OVERRUN_TRIM_ELLIPSIS) if _province_list_size_labels[index]: _province_list_size_labels[index].set_text(GUINode.int_to_string_suffixed(province_list_info[size_key])) @@ -551,12 +546,11 @@ func _update_distributions(): if colour_icon_rect: colour_icon_rect.set_modulate(distribution_row[slice_colour_key]) - var identifier_label : Label = GUINode.get_label_from_node(child.get_node(^"./legend_title")) + var identifier_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_title")) if identifier_label: - identifier_label.set_text_overrun_behavior(TextServer.OVERRUN_TRIM_ELLIPSIS) identifier_label.set_text(distribution_row[slice_identifier_key]) - var weight_label : Label = GUINode.get_label_from_node(child.get_node(^"./legend_value")) + var weight_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_value")) if weight_label: weight_label.set_text("%s%%" % GUINode.float_to_string_dp(distribution_row[slice_weight_key] * 100.0, 1)) -- cgit v1.2.3-56-ga3b1 From d7672f406406eea46625bc725690651f28211e19 Mon Sep 17 00:00:00 2001 From: hop311 Date: Mon, 26 Aug 2024 23:54:19 +0100 Subject: Rename GUITextLabel to GUILabel --- .../src/openvic-extension/classes/GUILabel.cpp | 774 +++++++++++++++++++++ .../src/openvic-extension/classes/GUILabel.hpp | 116 +++ .../src/openvic-extension/classes/GUINode.cpp | 2 +- .../src/openvic-extension/classes/GUINode.hpp | 6 +- .../src/openvic-extension/classes/GUITextLabel.cpp | 774 --------------------- .../src/openvic-extension/classes/GUITextLabel.hpp | 116 --- extension/src/openvic-extension/register_types.cpp | 4 +- .../src/openvic-extension/utility/UITools.cpp | 16 +- .../NationManagementScreen/BudgetMenu.gd | 96 +-- .../NationManagementScreen/PopulationMenu.gd | 42 +- game/src/Game/GameSession/ProvinceOverviewPanel.gd | 62 +- game/src/Game/GameSession/Topbar.gd | 108 +-- 12 files changed, 1058 insertions(+), 1058 deletions(-) create mode 100644 extension/src/openvic-extension/classes/GUILabel.cpp create mode 100644 extension/src/openvic-extension/classes/GUILabel.hpp delete mode 100644 extension/src/openvic-extension/classes/GUITextLabel.cpp delete mode 100644 extension/src/openvic-extension/classes/GUITextLabel.hpp (limited to 'game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd') diff --git a/extension/src/openvic-extension/classes/GUILabel.cpp b/extension/src/openvic-extension/classes/GUILabel.cpp new file mode 100644 index 0000000..9fd6b60 --- /dev/null +++ b/extension/src/openvic-extension/classes/GUILabel.cpp @@ -0,0 +1,774 @@ +#include "GUILabel.hpp" + +#include +#include +#include + +#include "openvic-extension/singletons/AssetManager.hpp" +#include "openvic-extension/utility/ClassBindings.hpp" +#include "openvic-extension/utility/Utilities.hpp" + +using namespace OpenVic; +using namespace godot; +using namespace OpenVic::Utilities::literals; + +static constexpr int32_t DEFAULT_FONT_SIZE = 16; + +void GUILabel::_bind_methods() { + OV_BIND_METHOD(GUILabel::clear); + OV_BIND_METHOD(GUILabel::get_gui_text_name); + + OV_BIND_METHOD(GUILabel::get_text); + OV_BIND_METHOD(GUILabel::set_text, { "new_text" }); + + OV_BIND_METHOD(GUILabel::get_substitution_dict); + OV_BIND_METHOD(GUILabel::add_substitution, { "key", "value" }); + OV_BIND_METHOD(GUILabel::set_substitution_dict, { "new_substitution_dict" }); + OV_BIND_METHOD(GUILabel::clear_substitutions); + + OV_BIND_METHOD(GUILabel::get_horizontal_alignment); + OV_BIND_METHOD(GUILabel::set_horizontal_alignment, { "new_horizontal_alignment" }); + OV_BIND_METHOD(GUILabel::get_max_size); + OV_BIND_METHOD(GUILabel::set_max_size, { "new_max_size" }); + OV_BIND_METHOD(GUILabel::get_border_size); + OV_BIND_METHOD(GUILabel::set_border_size, { "new_border_size" }); + OV_BIND_METHOD(GUILabel::get_adjusted_rect); + OV_BIND_METHOD(GUILabel::will_auto_adjust_to_content_size); + OV_BIND_METHOD(GUILabel::set_auto_adjust_to_content_size, { "new_auto_adjust_to_content_size" }); + + OV_BIND_METHOD(GUILabel::get_font); + OV_BIND_METHOD(GUILabel::set_font, { "new_font" }); + OV_BIND_METHOD(GUILabel::set_font_file, { "new_font_file" }); + OV_BIND_METHOD(GUILabel::get_font_size); + OV_BIND_METHOD(GUILabel::set_font_size, { "new_font_size" }); + OV_BIND_METHOD(GUILabel::get_default_colour); + OV_BIND_METHOD(GUILabel::set_default_colour, { "new_default_colour" }); + OV_BIND_METHOD(GUILabel::get_currency_texture); + + OV_BIND_METHOD(GUILabel::get_background); + OV_BIND_METHOD(GUILabel::set_background_texture, { "new_texture" }); + OV_BIND_METHOD(GUILabel::set_background_stylebox, { "new_stylebox_texture" }); + + ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT), "set_text", "get_text"); + ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "substitution_dict"), "set_substitution_dict", "get_substitution_dict"); + ADD_PROPERTY( + PropertyInfo(Variant::INT, "horizontal_alignment", PROPERTY_HINT_ENUM, "Left,Centre,Right,Fill"), + "set_horizontal_alignment", "get_horizontal_alignment" + ); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "max_size", PROPERTY_HINT_NONE, "suffix:px"), "set_max_size", "get_max_size"); + ADD_PROPERTY( + PropertyInfo(Variant::VECTOR2, "border_size", PROPERTY_HINT_NONE, "suffix:px"), "set_border_size", "get_border_size" + ); + ADD_PROPERTY( + PropertyInfo(Variant::RECT2, "adjusted_rect", PROPERTY_HINT_NONE, "suffix:px"), "", "get_adjusted_rect" + ); + ADD_PROPERTY( + PropertyInfo(Variant::BOOL, "auto_adjust_to_content_size"), "set_auto_adjust_to_content_size", + "will_auto_adjust_to_content_size" + ); + + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_font", "get_font"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "font_size", PROPERTY_HINT_NONE, "suffix:px"), "set_font_size", "get_font_size"); + ADD_PROPERTY(PropertyInfo(Variant::COLOR, "default_colour"), "set_default_colour", "get_default_colour"); + ADD_PROPERTY( + PropertyInfo(Variant::OBJECT, "currency_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "", "get_currency_texture" + ); + ADD_PROPERTY( + PropertyInfo(Variant::OBJECT, "background", PROPERTY_HINT_RESOURCE_TYPE, "StyleBoxTexture"), "set_background_stylebox", + "get_background" + ); +} + +void GUILabel::_notification(int what) { + switch (what) { + case NOTIFICATION_RESIZED: + case NOTIFICATION_TRANSLATION_CHANGED: { + _queue_line_update(); + } break; + case NOTIFICATION_DRAW: { + const RID ci = get_canvas_item(); + + if (background.is_valid()) { + draw_style_box(background, adjusted_rect); + } + + if (font.is_null()) { + return; + } + + // Starting offset needed + static const Vector2 base_offset { 1.0_real, -1.0_real }; + const Vector2 offset = base_offset + adjusted_rect.position + border_size; + Vector2 position = offset; + + for (line_t const& line : lines) { + position.x = offset.x; + switch (horizontal_alignment) { + case HORIZONTAL_ALIGNMENT_CENTER: { + position.x += (adjusted_rect.size.width - 2 * border_size.width - line.width + 1.0_real) / 2.0_real; + } break; + case HORIZONTAL_ALIGNMENT_RIGHT: { + position.x += adjusted_rect.size.width - 2 * border_size.width - line.width; + } break; + case HORIZONTAL_ALIGNMENT_LEFT: + default: + break; + } + + position.y += font->get_ascent(font_size); + + for (segment_t const& segment : line.segments) { + string_segment_t const* string_segment = std::get_if(&segment); + + if (string_segment == nullptr) { + if (currency_texture.is_valid()) { + currency_texture->draw( + ci, position - Vector2 { + 1.0_real, static_cast(currency_texture->get_height()) * 0.75_real + } + ); + position.x += currency_texture->get_width(); + } + } else { + font->draw_string( + ci, position, string_segment->text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, + string_segment->colour + ); + position.x += string_segment->width; + } + } + + position.y += font->get_descent(font_size); + } + + } break; + } +} + +GUILabel::GUILabel() + : gui_text { nullptr }, + text {}, + substitution_dict {}, + horizontal_alignment { HORIZONTAL_ALIGNMENT_LEFT }, + max_size {}, + border_size {}, + adjusted_rect {}, + auto_adjust_to_content_size { false }, + font {}, + font_size { DEFAULT_FONT_SIZE }, + default_colour {}, + colour_codes { nullptr }, + currency_texture {}, + background {}, + lines {}, + line_update_queued { false } {} + +void GUILabel::clear() { + gui_text = nullptr; + + text = String {}; + substitution_dict.clear(); + horizontal_alignment = HORIZONTAL_ALIGNMENT_LEFT; + max_size = {}; + border_size = {}; + adjusted_rect = {}; + auto_adjust_to_content_size = false; + + font.unref(); + font_size = DEFAULT_FONT_SIZE; + default_colour = {}; + colour_codes = nullptr; + currency_texture.unref(); + + background.unref(); + lines.clear(); + + line_update_queued = false; + + queue_redraw(); +} + +String GUILabel::get_gui_text_name() const { + return gui_text != nullptr ? Utilities::std_to_godot_string(gui_text->get_name()) : String {}; +} + +Error GUILabel::set_gui_text(GUI::Text const* new_gui_text, GFX::Font::colour_codes_t const* override_colour_codes) { + if (gui_text == new_gui_text) { + return OK; + } + + if (new_gui_text == nullptr) { + clear(); + return OK; + } + + gui_text = new_gui_text; + + set_text(Utilities::std_to_godot_string(gui_text->get_text())); + + using enum GUI::AlignedElement::format_t; + static const ordered_map format_map { + { left, HORIZONTAL_ALIGNMENT_LEFT }, + { centre, HORIZONTAL_ALIGNMENT_CENTER }, + { right, HORIZONTAL_ALIGNMENT_RIGHT } + }; + const decltype(format_map)::const_iterator it = format_map.find(gui_text->get_format()); + set_horizontal_alignment(it != format_map.end() ? it->second : HORIZONTAL_ALIGNMENT_LEFT); + + set_max_size(Utilities::to_godot_fvec2(gui_text->get_max_size())); + set_border_size(Utilities::to_godot_fvec2(gui_text->get_border_size())); + + colour_codes = override_colour_codes != nullptr ? override_colour_codes : &gui_text->get_font()->get_colour_codes(); + set_default_colour(Utilities::to_godot_color(gui_text->get_font()->get_colour())); + + font.unref(); + font_size = DEFAULT_FONT_SIZE; + currency_texture.unref(); + background.unref(); + + Error err = OK; + + AssetManager* asset_manager = AssetManager::get_singleton(); + if (asset_manager != nullptr) { + const StringName font_filepath = Utilities::std_to_godot_string(gui_text->get_font()->get_fontname()); + Ref font_file = asset_manager->get_font(font_filepath); + if (font_file.is_valid()) { + if (set_font_file(font_file) != OK) { + err = FAILED; + } + } else { + UtilityFunctions::push_error("Failed to load font \"", font_filepath, "\" for GUILabel"); + err = FAILED; + } + + if (!gui_text->get_texture_file().empty()) { + const StringName texture_path = Utilities::std_to_godot_string(gui_text->get_texture_file()); + Ref texture = asset_manager->get_texture(texture_path); + if (texture.is_valid()) { + set_background_texture(texture); + } else { + UtilityFunctions::push_error("Failed to load texture \"", texture_path, "\" for GUILabel ", get_name()); + err = FAILED; + } + } + } else { + UtilityFunctions::push_error("Failed to get AssetManager singleton for GUILabel"); + err = FAILED; + } + + _queue_line_update(); + + return err; +} + +void GUILabel::set_text(String const& new_text) { + if (text != new_text) { + text = new_text; + + _queue_line_update(); + } +} + +void GUILabel::add_substitution(String const& key, String const& value) { + Variant& existing_value = substitution_dict[key]; + if (existing_value != value) { + existing_value = value; + + _queue_line_update(); + } +} + +void GUILabel::set_substitution_dict(Dictionary const& new_substitution_dict) { + substitution_dict = new_substitution_dict; + _queue_line_update(); +} + +void GUILabel::clear_substitutions() { + if (!substitution_dict.is_empty()) { + substitution_dict.clear(); + + _queue_line_update(); + } +} + +void GUILabel::set_horizontal_alignment(HorizontalAlignment new_horizontal_alignment) { + if (horizontal_alignment != new_horizontal_alignment) { + horizontal_alignment = new_horizontal_alignment; + + _queue_line_update(); + } +} + +void GUILabel::set_max_size(Size2 new_max_size) { + if (max_size != new_max_size) { + max_size = new_max_size; + + set_custom_minimum_size(max_size); + set_size(max_size); + + _queue_line_update(); + } +} + +void GUILabel::set_border_size(Size2 new_border_size) { + if (border_size != new_border_size) { + border_size = new_border_size; + + update_stylebox_border_size(); + + _queue_line_update(); + } +} + +void GUILabel::set_auto_adjust_to_content_size(bool new_auto_adjust_to_content_size) { + if (auto_adjust_to_content_size != new_auto_adjust_to_content_size) { + auto_adjust_to_content_size = new_auto_adjust_to_content_size; + + adjust_to_content_size(); + + queue_redraw(); + } +} + +Ref GUILabel::get_font() const { + return font; +} + +void GUILabel::set_font(Ref const& new_font) { + font = new_font; + + _queue_line_update(); +} + +Error GUILabel::set_font_file(Ref const& new_font_file) { + ERR_FAIL_NULL_V(new_font_file, FAILED); + + set_font(new_font_file); + + return set_font_size(new_font_file->get_fixed_size()); +} + +Error GUILabel::set_font_size(int32_t new_font_size) { + font_size = new_font_size; + + _queue_line_update(); + + AssetManager* asset_manager = AssetManager::get_singleton(); + ERR_FAIL_NULL_V_MSG(asset_manager, FAILED, "Failed to get AssetManager singleton for GUILabel"); + + currency_texture = asset_manager->get_currency_texture(font_size); + ERR_FAIL_NULL_V(currency_texture, FAILED); + + return OK; +} + +void GUILabel::set_default_colour(Color const& new_default_colour) { + if (default_colour != new_default_colour) { + default_colour = new_default_colour; + _queue_line_update(); + } +} + +Ref GUILabel::get_currency_texture() const { + return currency_texture; +} + +Ref GUILabel::get_background() const { + return background; +} + +void GUILabel::set_background_texture(Ref const& new_texture) { + Ref new_background; + + if (new_texture.is_valid()) { + new_background.instantiate(); + ERR_FAIL_NULL(new_background); + + new_background->set_texture(new_texture); + } + + set_background_stylebox(new_background); +} + +void GUILabel::set_background_stylebox(Ref const& new_stylebox_texture) { + if (background != new_stylebox_texture) { + background = new_stylebox_texture; + update_stylebox_border_size(); + queue_redraw(); + } +} + +void GUILabel::update_stylebox_border_size() { + if (background.is_valid()) { + background->set_texture_margin(SIDE_LEFT, border_size.width); + background->set_texture_margin(SIDE_RIGHT, border_size.width); + background->set_texture_margin(SIDE_TOP, border_size.height); + background->set_texture_margin(SIDE_BOTTOM, border_size.height); + } +} + +real_t GUILabel::get_string_width(String const& string) const { + return font->get_string_size(string, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width; +} + +real_t GUILabel::get_segment_width(segment_t const& segment) const { + if (string_segment_t const* string_segment = std::get_if(&segment)) { + return string_segment->width; + } else if (currency_texture.is_valid()) { + return currency_texture->get_width(); + } else { + return 0.0_real; + } +} + +void GUILabel::_queue_line_update() { + if (!line_update_queued) { + line_update_queued = true; + + callable_mp(this, &GUILabel::_update_lines).call_deferred(); + } +} + +void GUILabel::_update_lines() { + line_update_queued = false; + lines.clear(); + + if (text.is_empty() || font.is_null()) { + queue_redraw(); + return; + } + + String const& base_text = is_auto_translating() ? tr(text) : text; + + String const& substituted_text = generate_substituted_text(base_text); + + auto const& [display_text, colour_instructions] = generate_display_text_and_colour_instructions(substituted_text); + + std::vector unwrapped_lines = generate_lines_and_segments(display_text, colour_instructions); + + lines = wrap_lines(unwrapped_lines); + + adjust_to_content_size(); + + queue_redraw(); +} + +String GUILabel::generate_substituted_text(String const& base_text) const { + static const String SUBSTITUTION_MARKER = String::chr(0x24); // $ + + String result; + int64_t start_pos = 0; + int64_t marker_start_pos; + + while ((marker_start_pos = base_text.find(SUBSTITUTION_MARKER, start_pos)) != -1) { + result += base_text.substr(start_pos, marker_start_pos - start_pos); + + int64_t marker_end_pos = base_text.find(SUBSTITUTION_MARKER, marker_start_pos + SUBSTITUTION_MARKER.length()); + if (marker_end_pos == -1) { + marker_end_pos = base_text.length(); + } + + String key = base_text.substr( + marker_start_pos + SUBSTITUTION_MARKER.length(), marker_end_pos - marker_start_pos - SUBSTITUTION_MARKER.length() + ); + String value = substitution_dict.get(key, String {}); + + // Use the un-substituted key if no value is found or the value is empty + result += value.is_empty() ? key : is_auto_translating() ? tr(value) : value; + + start_pos = marker_end_pos + SUBSTITUTION_MARKER.length(); + } + + if (start_pos < base_text.length()) { + result += base_text.substr(start_pos); + } + + return result; +} + +std::pair GUILabel::generate_display_text_and_colour_instructions( + String const& substituted_text +) const { + static const String COLOUR_MARKER = String::chr(0xA7); // § + + String result; + colour_instructions_t colour_instructions; + int64_t start_pos = 0; + int64_t marker_pos; + + while ((marker_pos = substituted_text.find(COLOUR_MARKER, start_pos)) != -1) { + result += substituted_text.substr(start_pos, marker_pos - start_pos); + + if (marker_pos + COLOUR_MARKER.length() < substituted_text.length()) { + const char32_t colour_code = substituted_text[marker_pos + COLOUR_MARKER.length()]; + + // Check that the colour code can be safely cast to a char + if (colour_code >> sizeof(char) * CHAR_BIT == 0) { + colour_instructions.emplace_back(result.length(), static_cast(colour_code)); + } + + start_pos = marker_pos + COLOUR_MARKER.length() + 1; + } else { + return { std::move(result), std::move(colour_instructions) }; + } + } + + result += substituted_text.substr(start_pos); + + return { std::move(result), std::move(colour_instructions) }; +} + +std::vector GUILabel::generate_lines_and_segments( + String const& display_text, colour_instructions_t const& colour_instructions +) const { + static constexpr char RESET_COLOUR_CODE = '!'; + + std::vector unwrapped_lines; + colour_instructions_t::const_iterator colour_it = colour_instructions.begin(); + Color current_colour = default_colour; + int64_t section_start = 0; + + unwrapped_lines.emplace_back(); + + for (int64_t idx = 0; idx < display_text.length(); ++idx) { + if (colour_it != colour_instructions.end() && idx == colour_it->first) { + Color new_colour = current_colour; + if (colour_it->second == RESET_COLOUR_CODE) { + new_colour = default_colour; + } else { + const GFX::Font::colour_codes_t::const_iterator it = colour_codes->find(colour_it->second); + if (it != colour_codes->end()) { + new_colour = Utilities::to_godot_color(it->second); + } + } + ++colour_it; + + if (current_colour != new_colour) { + if (section_start < idx) { + separate_lines( + display_text.substr(section_start, idx - section_start), current_colour, unwrapped_lines + ); + section_start = idx; + } + current_colour = new_colour; + } + } + } + + if (section_start < display_text.length()) { + separate_lines(display_text.substr(section_start), current_colour, unwrapped_lines); + } + + return unwrapped_lines; +} + +void GUILabel::separate_lines( + String const& string, Color const& colour, std::vector& unwrapped_lines +) const { + static const String NEWLINE_MARKER = "\n"; + + int64_t start_pos = 0; + int64_t newline_pos; + + while ((newline_pos = string.find(NEWLINE_MARKER, start_pos)) != -1) { + if (start_pos < newline_pos) { + separate_currency_segments(string.substr(start_pos, newline_pos - start_pos), colour, unwrapped_lines.back()); + } + + unwrapped_lines.emplace_back(); + + start_pos = newline_pos + NEWLINE_MARKER.length(); + } + + if (start_pos < string.length()) { + separate_currency_segments(string.substr(start_pos), colour, unwrapped_lines.back()); + } +} + +void GUILabel::separate_currency_segments( + String const& string, Color const& colour, line_t& line +) const { + static const String CURRENCY_MARKER = String::chr(0xA4); // ¤ + + const auto push_string_segment = [this, &string, &colour, &line](int64_t start, int64_t end) -> void { + String substring = string.substr(start, end - start); + const real_t width = get_string_width(substring); + line.segments.emplace_back(string_segment_t { std::move(substring), colour, width }); + line.width += width; + }; + + int64_t start_pos = 0; + int64_t marker_pos; + + const real_t currency_width = currency_texture.is_valid() ? currency_texture->get_width() : 0.0_real; + + while ((marker_pos = string.find(CURRENCY_MARKER, start_pos)) != -1) { + if (start_pos < marker_pos) { + push_string_segment(start_pos, marker_pos); + } + + line.segments.push_back(currency_segment_t {}); + line.width += currency_width; + + start_pos = marker_pos + CURRENCY_MARKER.length(); + } + + if (start_pos < string.length()) { + push_string_segment(start_pos, string.length()); + } +} + +std::vector GUILabel::wrap_lines(std::vector& unwrapped_lines) const { + std::vector wrapped_lines; + + const Size2 max_content_size = max_size - 2 * border_size; + + for (line_t& line : unwrapped_lines) { + if (line.width <= max_content_size.width) { + wrapped_lines.push_back(std::move(line)); + } else { + line_t* current_line = &wrapped_lines.emplace_back(); + + for (segment_t& segment : line.segments) { + const real_t segment_width = get_segment_width(segment); + + if (current_line->width + segment_width <= max_content_size.width) { + // Segement on current line + current_line->segments.emplace_back(std::move(segment)); + current_line->width += segment_width; + } else if (string_segment_t const* string_segment = std::get_if(&segment)) { + // String segement wrapped onto new line + static const String SPACE_MARKER = " "; + + String const& string = string_segment->text; + + int64_t start_pos = 0; + + while (start_pos < string.length()) { + String whole_segment_string = string.substr(start_pos); + real_t whole_segment_width = get_string_width(whole_segment_string); + + if (current_line->width + whole_segment_width > max_content_size.width) { + String new_segment_string; + real_t new_segment_width = 0.0_real; + + int64_t last_marker_pos = 0; + int64_t marker_pos; + + while ((marker_pos = whole_segment_string.find(SPACE_MARKER, last_marker_pos)) != -1) { + String substring = whole_segment_string.substr(0, marker_pos); + const real_t width = get_string_width(substring); + if (current_line->width + width <= max_content_size.width) { + new_segment_string = std::move(substring); + new_segment_width = width; + last_marker_pos = marker_pos + SPACE_MARKER.length(); + } else { + break; + } + } + + if (last_marker_pos != 0 || !current_line->segments.empty()) { + if (!new_segment_string.is_empty()) { + current_line->segments.emplace_back(string_segment_t { + std::move(new_segment_string), string_segment->colour, new_segment_width + }); + current_line->width += new_segment_width; + } + + current_line = &wrapped_lines.emplace_back(); + + start_pos += last_marker_pos; + + continue; + } + } + current_line->segments.emplace_back(string_segment_t { + std::move(whole_segment_string), string_segment->colour, whole_segment_width + }); + current_line->width += whole_segment_width; + break; + } + + } else { + // Currency segement on new line + line_t* current_line = &wrapped_lines.emplace_back(); + current_line->segments.push_back(std::move(segment)); + current_line->width = segment_width; + } + } + } + } + + const auto is_over_max_height = [this, &wrapped_lines, &max_content_size]() -> bool { + return wrapped_lines.size() > 1 + && wrapped_lines.size() * font->get_height(font_size) > max_content_size.height; + }; + + if (is_over_max_height()) { + do { + wrapped_lines.pop_back(); + } while (is_over_max_height()); + + static const String ELLIPSIS = "..."; + const real_t ellipsis_width = get_string_width(ELLIPSIS); + + line_t& last_line = wrapped_lines.back(); + Color last_colour = default_colour; + + while (last_line.segments.size() > 0 && last_line.width + ellipsis_width > max_content_size.width) { + if (string_segment_t* string_segment = std::get_if(&last_line.segments.back())) { + last_colour = string_segment->colour; + + String& last_string = string_segment->text; + if (last_string.length() > 1) { + last_string = last_string.substr(0, last_string.length() - 1); + + last_line.width -= string_segment->width; + string_segment->width = get_string_width(last_string); + last_line.width += string_segment->width; + } else { + last_line.width -= string_segment->width; + last_line.segments.pop_back(); + } + } else { + last_line.width -= currency_texture->get_width(); + last_line.segments.pop_back(); + } + } + + last_line.segments.push_back(string_segment_t { ELLIPSIS, last_colour, ellipsis_width }); + last_line.width += ellipsis_width; + } + + return wrapped_lines; +} + +void GUILabel::adjust_to_content_size() { + if (auto_adjust_to_content_size) { + adjusted_rect = {}; + + for (line_t const& line : lines) { + if (adjusted_rect.size.width < line.width) { + adjusted_rect.size.width = line.width; + } + } + + adjusted_rect.size.height = lines.size() * font->get_height(font_size); + + adjusted_rect.size += 2 * border_size; + + switch (horizontal_alignment) { + case HORIZONTAL_ALIGNMENT_CENTER: { + adjusted_rect.position.x = (max_size.width - adjusted_rect.size.width + 1.0_real) / 2.0_real; + } break; + case HORIZONTAL_ALIGNMENT_RIGHT: { + adjusted_rect.position.x = max_size.width - adjusted_rect.size.width; + } break; + case HORIZONTAL_ALIGNMENT_LEFT: + default: + break; + } + } else { + adjusted_rect = { {}, max_size }; + } +} diff --git a/extension/src/openvic-extension/classes/GUILabel.hpp b/extension/src/openvic-extension/classes/GUILabel.hpp new file mode 100644 index 0000000..e0982b2 --- /dev/null +++ b/extension/src/openvic-extension/classes/GUILabel.hpp @@ -0,0 +1,116 @@ +#pragma once + +#include +#include +#include +#include + +#include + +#include "openvic-extension/classes/GFXSpriteTexture.hpp" + +namespace OpenVic { + class GUILabel : public godot::Control { + GDCLASS(GUILabel, godot::Control) + + using colour_instructions_t = std::vector>; + + GUI::Text const* PROPERTY(gui_text); + + godot::String PROPERTY(text); + godot::Dictionary PROPERTY(substitution_dict); + godot::HorizontalAlignment PROPERTY(horizontal_alignment); + godot::Size2 PROPERTY(max_size); // Actual max size is max_size - 2 * border_size + godot::Size2 PROPERTY(border_size); // The padding between the Nodes bounding box and the text within it + godot::Rect2 PROPERTY(adjusted_rect); // Offset + size after adjustment to fit content size + bool PROPERTY_CUSTOM_PREFIX(auto_adjust_to_content_size, will); + + godot::Ref font; + int32_t PROPERTY(font_size); + godot::Color PROPERTY(default_colour); + GFX::Font::colour_codes_t const* colour_codes; + godot::Ref currency_texture; + + godot::Ref background; + + struct string_segment_t { + godot::String text; + godot::Color colour; + real_t width; + }; + using currency_segment_t = std::monostate; + using segment_t = std::variant; + struct line_t { + std::vector segments; + real_t width {}; + }; + + std::vector lines; + + bool line_update_queued; + + protected: + static void _bind_methods(); + + void _notification(int what); + + public: + GUILabel(); + + /* Reset gui_text to nullptr and reset current text. */ + void clear(); + /* Return the name of the GUI::Text, or an empty String if it's null. */ + godot::String get_gui_text_name() const; + /* Set the GUI::Text. */ + godot::Error set_gui_text( + GUI::Text const* new_gui_text, GFX::Font::colour_codes_t const* override_colour_codes = nullptr + ); + + void set_text(godot::String const& new_text); + + void add_substitution(godot::String const& key, godot::String const& value); + void set_substitution_dict(godot::Dictionary const& new_substitution_dict); + void clear_substitutions(); + + void set_horizontal_alignment(godot::HorizontalAlignment new_horizontal_alignment); + void set_max_size(godot::Size2 new_max_size); + void set_border_size(godot::Size2 new_border_size); + void set_auto_adjust_to_content_size(bool new_auto_adjust_to_content_size); + + godot::Ref get_font() const; + void set_font(godot::Ref const& new_font); + godot::Error set_font_file(godot::Ref const& new_font_file); + godot::Error set_font_size(int32_t new_font_size); + void set_default_colour(godot::Color const& new_default_colour); + + godot::Ref get_currency_texture() const; + + godot::Ref get_background() const; + void set_background_texture(godot::Ref const& new_texture); + void set_background_stylebox(godot::Ref const& new_stylebox_texture); + + private: + void update_stylebox_border_size(); + real_t get_string_width(godot::String const& string) const; + real_t get_segment_width(segment_t const& segment) const; + + void _queue_line_update(); + void _update_lines(); + + godot::String generate_substituted_text(godot::String const& base_text) const; + std::pair generate_display_text_and_colour_instructions( + godot::String const& substituted_text + ) const; + std::vector generate_lines_and_segments( + godot::String const& display_text, colour_instructions_t const& colour_instructions + ) const; + void separate_lines( + godot::String const& string, godot::Color const& colour, std::vector& lines + ) const; + void separate_currency_segments( + godot::String const& string, godot::Color const& colour, line_t& line + ) const; + std::vector wrap_lines(std::vector& unwrapped_lines) const; + void adjust_to_content_size(); + }; +} diff --git a/extension/src/openvic-extension/classes/GUINode.cpp b/extension/src/openvic-extension/classes/GUINode.cpp index 4d7d33e..25ef821 100644 --- a/extension/src/openvic-extension/classes/GUINode.cpp +++ b/extension/src/openvic-extension/classes/GUINode.cpp @@ -40,7 +40,7 @@ using namespace OpenVic; #define APPLY_TO_CHILD_TYPES(F) \ F(Button, button) \ - F(GUITextLabel, gui_text_label) \ + F(GUILabel, gui_label) \ F(Panel, panel) \ F(TextureProgressBar, progress_bar) \ F(TextureRect, texture_rect) \ diff --git a/extension/src/openvic-extension/classes/GUINode.hpp b/extension/src/openvic-extension/classes/GUINode.hpp index 6168e7e..73ca92b 100644 --- a/extension/src/openvic-extension/classes/GUINode.hpp +++ b/extension/src/openvic-extension/classes/GUINode.hpp @@ -21,10 +21,10 @@ #include "openvic-extension/classes/GFXMaskedFlagTexture.hpp" #include "openvic-extension/classes/GFXPieChartTexture.hpp" #include "openvic-extension/classes/GFXSpriteTexture.hpp" +#include "openvic-extension/classes/GUILabel.hpp" #include "openvic-extension/classes/GUIListBox.hpp" #include "openvic-extension/classes/GUIOverlappingElementsBox.hpp" #include "openvic-extension/classes/GUIScrollbar.hpp" -#include "openvic-extension/classes/GUITextLabel.hpp" namespace OpenVic { class GUINode : public godot::Control { @@ -52,7 +52,7 @@ namespace OpenVic { static godot::Vector2 get_gui_position(godot::String const& gui_scene, godot::String const& gui_position); static godot::Button* get_button_from_node(godot::Node* node); - static GUITextLabel* get_gui_text_label_from_node(godot::Node* node); + static GUILabel* get_gui_label_from_node(godot::Node* node); static godot::Panel* get_panel_from_node(godot::Node* node); static godot::TextureProgressBar* get_progress_bar_from_node(godot::Node* node); static godot::TextureRect* get_texture_rect_from_node(godot::Node* node); @@ -62,7 +62,7 @@ namespace OpenVic { static godot::LineEdit* get_line_edit_from_node(godot::Node* node); godot::Button* get_button_from_nodepath(godot::NodePath const& path) const; - GUITextLabel* get_gui_text_label_from_nodepath(godot::NodePath const& path) const; + GUILabel* get_gui_label_from_nodepath(godot::NodePath const& path) const; godot::Panel* get_panel_from_nodepath(godot::NodePath const& path) const; godot::TextureProgressBar* get_progress_bar_from_nodepath(godot::NodePath const& path) const; godot::TextureRect* get_texture_rect_from_nodepath(godot::NodePath const& path) const; diff --git a/extension/src/openvic-extension/classes/GUITextLabel.cpp b/extension/src/openvic-extension/classes/GUITextLabel.cpp deleted file mode 100644 index ec8f158..0000000 --- a/extension/src/openvic-extension/classes/GUITextLabel.cpp +++ /dev/null @@ -1,774 +0,0 @@ -#include "GUITextLabel.hpp" - -#include -#include -#include - -#include "openvic-extension/singletons/AssetManager.hpp" -#include "openvic-extension/utility/ClassBindings.hpp" -#include "openvic-extension/utility/Utilities.hpp" - -using namespace OpenVic; -using namespace godot; -using namespace OpenVic::Utilities::literals; - -static constexpr int32_t DEFAULT_FONT_SIZE = 16; - -void GUITextLabel::_bind_methods() { - OV_BIND_METHOD(GUITextLabel::clear); - OV_BIND_METHOD(GUITextLabel::get_gui_text_name); - - OV_BIND_METHOD(GUITextLabel::get_text); - OV_BIND_METHOD(GUITextLabel::set_text, { "new_text" }); - - OV_BIND_METHOD(GUITextLabel::get_substitution_dict); - OV_BIND_METHOD(GUITextLabel::add_substitution, { "key", "value" }); - OV_BIND_METHOD(GUITextLabel::set_substitution_dict, { "new_substitution_dict" }); - OV_BIND_METHOD(GUITextLabel::clear_substitutions); - - OV_BIND_METHOD(GUITextLabel::get_horizontal_alignment); - OV_BIND_METHOD(GUITextLabel::set_horizontal_alignment, { "new_horizontal_alignment" }); - OV_BIND_METHOD(GUITextLabel::get_max_size); - OV_BIND_METHOD(GUITextLabel::set_max_size, { "new_max_size" }); - OV_BIND_METHOD(GUITextLabel::get_border_size); - OV_BIND_METHOD(GUITextLabel::set_border_size, { "new_border_size" }); - OV_BIND_METHOD(GUITextLabel::get_adjusted_rect); - OV_BIND_METHOD(GUITextLabel::will_auto_adjust_to_content_size); - OV_BIND_METHOD(GUITextLabel::set_auto_adjust_to_content_size, { "new_auto_adjust_to_content_size" }); - - OV_BIND_METHOD(GUITextLabel::get_font); - OV_BIND_METHOD(GUITextLabel::set_font, { "new_font" }); - OV_BIND_METHOD(GUITextLabel::set_font_file, { "new_font_file" }); - OV_BIND_METHOD(GUITextLabel::get_font_size); - OV_BIND_METHOD(GUITextLabel::set_font_size, { "new_font_size" }); - OV_BIND_METHOD(GUITextLabel::get_default_colour); - OV_BIND_METHOD(GUITextLabel::set_default_colour, { "new_default_colour" }); - OV_BIND_METHOD(GUITextLabel::get_currency_texture); - - OV_BIND_METHOD(GUITextLabel::get_background); - OV_BIND_METHOD(GUITextLabel::set_background_texture, { "new_texture" }); - OV_BIND_METHOD(GUITextLabel::set_background_stylebox, { "new_stylebox_texture" }); - - ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT), "set_text", "get_text"); - ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "substitution_dict"), "set_substitution_dict", "get_substitution_dict"); - ADD_PROPERTY( - PropertyInfo(Variant::INT, "horizontal_alignment", PROPERTY_HINT_ENUM, "Left,Centre,Right,Fill"), - "set_horizontal_alignment", "get_horizontal_alignment" - ); - ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "max_size", PROPERTY_HINT_NONE, "suffix:px"), "set_max_size", "get_max_size"); - ADD_PROPERTY( - PropertyInfo(Variant::VECTOR2, "border_size", PROPERTY_HINT_NONE, "suffix:px"), "set_border_size", "get_border_size" - ); - ADD_PROPERTY( - PropertyInfo(Variant::RECT2, "adjusted_rect", PROPERTY_HINT_NONE, "suffix:px"), "", "get_adjusted_rect" - ); - ADD_PROPERTY( - PropertyInfo(Variant::BOOL, "auto_adjust_to_content_size"), "set_auto_adjust_to_content_size", - "will_auto_adjust_to_content_size" - ); - - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_font", "get_font"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "font_size", PROPERTY_HINT_NONE, "suffix:px"), "set_font_size", "get_font_size"); - ADD_PROPERTY(PropertyInfo(Variant::COLOR, "default_colour"), "set_default_colour", "get_default_colour"); - ADD_PROPERTY( - PropertyInfo(Variant::OBJECT, "currency_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "", "get_currency_texture" - ); - ADD_PROPERTY( - PropertyInfo(Variant::OBJECT, "background", PROPERTY_HINT_RESOURCE_TYPE, "StyleBoxTexture"), "set_background_stylebox", - "get_background" - ); -} - -void GUITextLabel::_notification(int what) { - switch (what) { - case NOTIFICATION_RESIZED: - case NOTIFICATION_TRANSLATION_CHANGED: { - _queue_line_update(); - } break; - case NOTIFICATION_DRAW: { - const RID ci = get_canvas_item(); - - if (background.is_valid()) { - draw_style_box(background, adjusted_rect); - } - - if (font.is_null()) { - return; - } - - // Starting offset needed - static const Vector2 base_offset { 1.0_real, -1.0_real }; - const Vector2 offset = base_offset + adjusted_rect.position + border_size; - Vector2 position = offset; - - for (line_t const& line : lines) { - position.x = offset.x; - switch (horizontal_alignment) { - case HORIZONTAL_ALIGNMENT_CENTER: { - position.x += (adjusted_rect.size.width - 2 * border_size.width - line.width + 1.0_real) / 2.0_real; - } break; - case HORIZONTAL_ALIGNMENT_RIGHT: { - position.x += adjusted_rect.size.width - 2 * border_size.width - line.width; - } break; - case HORIZONTAL_ALIGNMENT_LEFT: - default: - break; - } - - position.y += font->get_ascent(font_size); - - for (segment_t const& segment : line.segments) { - string_segment_t const* string_segment = std::get_if(&segment); - - if (string_segment == nullptr) { - if (currency_texture.is_valid()) { - currency_texture->draw( - ci, position - Vector2 { - 1.0_real, static_cast(currency_texture->get_height()) * 0.75_real - } - ); - position.x += currency_texture->get_width(); - } - } else { - font->draw_string( - ci, position, string_segment->text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, - string_segment->colour - ); - position.x += string_segment->width; - } - } - - position.y += font->get_descent(font_size); - } - - } break; - } -} - -GUITextLabel::GUITextLabel() - : gui_text { nullptr }, - text {}, - substitution_dict {}, - horizontal_alignment { HORIZONTAL_ALIGNMENT_LEFT }, - max_size {}, - border_size {}, - adjusted_rect {}, - auto_adjust_to_content_size { false }, - font {}, - font_size { DEFAULT_FONT_SIZE }, - default_colour {}, - colour_codes { nullptr }, - currency_texture {}, - background {}, - lines {}, - line_update_queued { false } {} - -void GUITextLabel::clear() { - gui_text = nullptr; - - text = String {}; - substitution_dict.clear(); - horizontal_alignment = HORIZONTAL_ALIGNMENT_LEFT; - max_size = {}; - border_size = {}; - adjusted_rect = {}; - auto_adjust_to_content_size = false; - - font.unref(); - font_size = DEFAULT_FONT_SIZE; - default_colour = {}; - colour_codes = nullptr; - currency_texture.unref(); - - background.unref(); - lines.clear(); - - line_update_queued = false; - - queue_redraw(); -} - -String GUITextLabel::get_gui_text_name() const { - return gui_text != nullptr ? Utilities::std_to_godot_string(gui_text->get_name()) : String {}; -} - -Error GUITextLabel::set_gui_text(GUI::Text const* new_gui_text, GFX::Font::colour_codes_t const* override_colour_codes) { - if (gui_text == new_gui_text) { - return OK; - } - - if (new_gui_text == nullptr) { - clear(); - return OK; - } - - gui_text = new_gui_text; - - set_text(Utilities::std_to_godot_string(gui_text->get_text())); - - using enum GUI::AlignedElement::format_t; - static const ordered_map format_map { - { left, HORIZONTAL_ALIGNMENT_LEFT }, - { centre, HORIZONTAL_ALIGNMENT_CENTER }, - { right, HORIZONTAL_ALIGNMENT_RIGHT } - }; - const decltype(format_map)::const_iterator it = format_map.find(gui_text->get_format()); - set_horizontal_alignment(it != format_map.end() ? it->second : HORIZONTAL_ALIGNMENT_LEFT); - - set_max_size(Utilities::to_godot_fvec2(gui_text->get_max_size())); - set_border_size(Utilities::to_godot_fvec2(gui_text->get_border_size())); - - colour_codes = override_colour_codes != nullptr ? override_colour_codes : &gui_text->get_font()->get_colour_codes(); - set_default_colour(Utilities::to_godot_color(gui_text->get_font()->get_colour())); - - font.unref(); - font_size = DEFAULT_FONT_SIZE; - currency_texture.unref(); - background.unref(); - - Error err = OK; - - AssetManager* asset_manager = AssetManager::get_singleton(); - if (asset_manager != nullptr) { - const StringName font_filepath = Utilities::std_to_godot_string(gui_text->get_font()->get_fontname()); - Ref font_file = asset_manager->get_font(font_filepath); - if (font_file.is_valid()) { - if (set_font_file(font_file) != OK) { - err = FAILED; - } - } else { - UtilityFunctions::push_error("Failed to load font \"", font_filepath, "\" for GUITextLabel"); - err = FAILED; - } - - if (!gui_text->get_texture_file().empty()) { - const StringName texture_path = Utilities::std_to_godot_string(gui_text->get_texture_file()); - Ref texture = asset_manager->get_texture(texture_path); - if (texture.is_valid()) { - set_background_texture(texture); - } else { - UtilityFunctions::push_error("Failed to load texture \"", texture_path, "\" for GUITextLabel ", get_name()); - err = FAILED; - } - } - } else { - UtilityFunctions::push_error("Failed to get AssetManager singleton for GUITextLabel"); - err = FAILED; - } - - _queue_line_update(); - - return err; -} - -void GUITextLabel::set_text(String const& new_text) { - if (text != new_text) { - text = new_text; - - _queue_line_update(); - } -} - -void GUITextLabel::add_substitution(String const& key, String const& value) { - Variant& existing_value = substitution_dict[key]; - if (existing_value != value) { - existing_value = value; - - _queue_line_update(); - } -} - -void GUITextLabel::set_substitution_dict(Dictionary const& new_substitution_dict) { - substitution_dict = new_substitution_dict; - _queue_line_update(); -} - -void GUITextLabel::clear_substitutions() { - if (!substitution_dict.is_empty()) { - substitution_dict.clear(); - - _queue_line_update(); - } -} - -void GUITextLabel::set_horizontal_alignment(HorizontalAlignment new_horizontal_alignment) { - if (horizontal_alignment != new_horizontal_alignment) { - horizontal_alignment = new_horizontal_alignment; - - _queue_line_update(); - } -} - -void GUITextLabel::set_max_size(Size2 new_max_size) { - if (max_size != new_max_size) { - max_size = new_max_size; - - set_custom_minimum_size(max_size); - set_size(max_size); - - _queue_line_update(); - } -} - -void GUITextLabel::set_border_size(Size2 new_border_size) { - if (border_size != new_border_size) { - border_size = new_border_size; - - update_stylebox_border_size(); - - _queue_line_update(); - } -} - -void GUITextLabel::set_auto_adjust_to_content_size(bool new_auto_adjust_to_content_size) { - if (auto_adjust_to_content_size != new_auto_adjust_to_content_size) { - auto_adjust_to_content_size = new_auto_adjust_to_content_size; - - adjust_to_content_size(); - - queue_redraw(); - } -} - -Ref GUITextLabel::get_font() const { - return font; -} - -void GUITextLabel::set_font(Ref const& new_font) { - font = new_font; - - _queue_line_update(); -} - -Error GUITextLabel::set_font_file(Ref const& new_font_file) { - ERR_FAIL_NULL_V(new_font_file, FAILED); - - set_font(new_font_file); - - return set_font_size(new_font_file->get_fixed_size()); -} - -Error GUITextLabel::set_font_size(int32_t new_font_size) { - font_size = new_font_size; - - _queue_line_update(); - - AssetManager* asset_manager = AssetManager::get_singleton(); - ERR_FAIL_NULL_V_MSG(asset_manager, FAILED, "Failed to get AssetManager singleton for GUITextLabel"); - - currency_texture = asset_manager->get_currency_texture(font_size); - ERR_FAIL_NULL_V(currency_texture, FAILED); - - return OK; -} - -void GUITextLabel::set_default_colour(Color const& new_default_colour) { - if (default_colour != new_default_colour) { - default_colour = new_default_colour; - _queue_line_update(); - } -} - -Ref GUITextLabel::get_currency_texture() const { - return currency_texture; -} - -Ref GUITextLabel::get_background() const { - return background; -} - -void GUITextLabel::set_background_texture(Ref const& new_texture) { - Ref new_background; - - if (new_texture.is_valid()) { - new_background.instantiate(); - ERR_FAIL_NULL(new_background); - - new_background->set_texture(new_texture); - } - - set_background_stylebox(new_background); -} - -void GUITextLabel::set_background_stylebox(Ref const& new_stylebox_texture) { - if (background != new_stylebox_texture) { - background = new_stylebox_texture; - update_stylebox_border_size(); - queue_redraw(); - } -} - -void GUITextLabel::update_stylebox_border_size() { - if (background.is_valid()) { - background->set_texture_margin(SIDE_LEFT, border_size.width); - background->set_texture_margin(SIDE_RIGHT, border_size.width); - background->set_texture_margin(SIDE_TOP, border_size.height); - background->set_texture_margin(SIDE_BOTTOM, border_size.height); - } -} - -real_t GUITextLabel::get_string_width(String const& string) const { - return font->get_string_size(string, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width; -} - -real_t GUITextLabel::get_segment_width(segment_t const& segment) const { - if (string_segment_t const* string_segment = std::get_if(&segment)) { - return string_segment->width; - } else if (currency_texture.is_valid()) { - return currency_texture->get_width(); - } else { - return 0.0_real; - } -} - -void GUITextLabel::_queue_line_update() { - if (!line_update_queued) { - line_update_queued = true; - - callable_mp(this, &GUITextLabel::_update_lines).call_deferred(); - } -} - -void GUITextLabel::_update_lines() { - line_update_queued = false; - lines.clear(); - - if (text.is_empty() || font.is_null()) { - queue_redraw(); - return; - } - - String const& base_text = is_auto_translating() ? tr(text) : text; - - String const& substituted_text = generate_substituted_text(base_text); - - auto const& [display_text, colour_instructions] = generate_display_text_and_colour_instructions(substituted_text); - - std::vector unwrapped_lines = generate_lines_and_segments(display_text, colour_instructions); - - lines = wrap_lines(unwrapped_lines); - - adjust_to_content_size(); - - queue_redraw(); -} - -String GUITextLabel::generate_substituted_text(String const& base_text) const { - static const String SUBSTITUTION_MARKER = String::chr(0x24); // $ - - String result; - int64_t start_pos = 0; - int64_t marker_start_pos; - - while ((marker_start_pos = base_text.find(SUBSTITUTION_MARKER, start_pos)) != -1) { - result += base_text.substr(start_pos, marker_start_pos - start_pos); - - int64_t marker_end_pos = base_text.find(SUBSTITUTION_MARKER, marker_start_pos + SUBSTITUTION_MARKER.length()); - if (marker_end_pos == -1) { - marker_end_pos = base_text.length(); - } - - String key = base_text.substr( - marker_start_pos + SUBSTITUTION_MARKER.length(), marker_end_pos - marker_start_pos - SUBSTITUTION_MARKER.length() - ); - String value = substitution_dict.get(key, String {}); - - // Use the un-substituted key if no value is found or the value is empty - result += value.is_empty() ? key : is_auto_translating() ? tr(value) : value; - - start_pos = marker_end_pos + SUBSTITUTION_MARKER.length(); - } - - if (start_pos < base_text.length()) { - result += base_text.substr(start_pos); - } - - return result; -} - -std::pair GUITextLabel::generate_display_text_and_colour_instructions( - String const& substituted_text -) const { - static const String COLOUR_MARKER = String::chr(0xA7); // § - - String result; - colour_instructions_t colour_instructions; - int64_t start_pos = 0; - int64_t marker_pos; - - while ((marker_pos = substituted_text.find(COLOUR_MARKER, start_pos)) != -1) { - result += substituted_text.substr(start_pos, marker_pos - start_pos); - - if (marker_pos + COLOUR_MARKER.length() < substituted_text.length()) { - const char32_t colour_code = substituted_text[marker_pos + COLOUR_MARKER.length()]; - - // Check that the colour code can be safely cast to a char - if (colour_code >> sizeof(char) * CHAR_BIT == 0) { - colour_instructions.emplace_back(result.length(), static_cast(colour_code)); - } - - start_pos = marker_pos + COLOUR_MARKER.length() + 1; - } else { - return { std::move(result), std::move(colour_instructions) }; - } - } - - result += substituted_text.substr(start_pos); - - return { std::move(result), std::move(colour_instructions) }; -} - -std::vector GUITextLabel::generate_lines_and_segments( - String const& display_text, colour_instructions_t const& colour_instructions -) const { - static constexpr char RESET_COLOUR_CODE = '!'; - - std::vector unwrapped_lines; - colour_instructions_t::const_iterator colour_it = colour_instructions.begin(); - Color current_colour = default_colour; - int64_t section_start = 0; - - unwrapped_lines.emplace_back(); - - for (int64_t idx = 0; idx < display_text.length(); ++idx) { - if (colour_it != colour_instructions.end() && idx == colour_it->first) { - Color new_colour = current_colour; - if (colour_it->second == RESET_COLOUR_CODE) { - new_colour = default_colour; - } else { - const GFX::Font::colour_codes_t::const_iterator it = colour_codes->find(colour_it->second); - if (it != colour_codes->end()) { - new_colour = Utilities::to_godot_color(it->second); - } - } - ++colour_it; - - if (current_colour != new_colour) { - if (section_start < idx) { - separate_lines( - display_text.substr(section_start, idx - section_start), current_colour, unwrapped_lines - ); - section_start = idx; - } - current_colour = new_colour; - } - } - } - - if (section_start < display_text.length()) { - separate_lines(display_text.substr(section_start), current_colour, unwrapped_lines); - } - - return unwrapped_lines; -} - -void GUITextLabel::separate_lines( - String const& string, Color const& colour, std::vector& unwrapped_lines -) const { - static const String NEWLINE_MARKER = "\n"; - - int64_t start_pos = 0; - int64_t newline_pos; - - while ((newline_pos = string.find(NEWLINE_MARKER, start_pos)) != -1) { - if (start_pos < newline_pos) { - separate_currency_segments(string.substr(start_pos, newline_pos - start_pos), colour, unwrapped_lines.back()); - } - - unwrapped_lines.emplace_back(); - - start_pos = newline_pos + NEWLINE_MARKER.length(); - } - - if (start_pos < string.length()) { - separate_currency_segments(string.substr(start_pos), colour, unwrapped_lines.back()); - } -} - -void GUITextLabel::separate_currency_segments( - String const& string, Color const& colour, line_t& line -) const { - static const String CURRENCY_MARKER = String::chr(0xA4); // ¤ - - const auto push_string_segment = [this, &string, &colour, &line](int64_t start, int64_t end) -> void { - String substring = string.substr(start, end - start); - const real_t width = get_string_width(substring); - line.segments.emplace_back(string_segment_t { std::move(substring), colour, width }); - line.width += width; - }; - - int64_t start_pos = 0; - int64_t marker_pos; - - const real_t currency_width = currency_texture.is_valid() ? currency_texture->get_width() : 0.0_real; - - while ((marker_pos = string.find(CURRENCY_MARKER, start_pos)) != -1) { - if (start_pos < marker_pos) { - push_string_segment(start_pos, marker_pos); - } - - line.segments.push_back(currency_segment_t {}); - line.width += currency_width; - - start_pos = marker_pos + CURRENCY_MARKER.length(); - } - - if (start_pos < string.length()) { - push_string_segment(start_pos, string.length()); - } -} - -std::vector GUITextLabel::wrap_lines(std::vector& unwrapped_lines) const { - std::vector wrapped_lines; - - const Size2 max_content_size = max_size - 2 * border_size; - - for (line_t& line : unwrapped_lines) { - if (line.width <= max_content_size.width) { - wrapped_lines.push_back(std::move(line)); - } else { - line_t* current_line = &wrapped_lines.emplace_back(); - - for (segment_t& segment : line.segments) { - const real_t segment_width = get_segment_width(segment); - - if (current_line->width + segment_width <= max_content_size.width) { - // Segement on current line - current_line->segments.emplace_back(std::move(segment)); - current_line->width += segment_width; - } else if (string_segment_t const* string_segment = std::get_if(&segment)) { - // String segement wrapped onto new line - static const String SPACE_MARKER = " "; - - String const& string = string_segment->text; - - int64_t start_pos = 0; - - while (start_pos < string.length()) { - String whole_segment_string = string.substr(start_pos); - real_t whole_segment_width = get_string_width(whole_segment_string); - - if (current_line->width + whole_segment_width > max_content_size.width) { - String new_segment_string; - real_t new_segment_width = 0.0_real; - - int64_t last_marker_pos = 0; - int64_t marker_pos; - - while ((marker_pos = whole_segment_string.find(SPACE_MARKER, last_marker_pos)) != -1) { - String substring = whole_segment_string.substr(0, marker_pos); - const real_t width = get_string_width(substring); - if (current_line->width + width <= max_content_size.width) { - new_segment_string = std::move(substring); - new_segment_width = width; - last_marker_pos = marker_pos + SPACE_MARKER.length(); - } else { - break; - } - } - - if (last_marker_pos != 0 || !current_line->segments.empty()) { - if (!new_segment_string.is_empty()) { - current_line->segments.emplace_back(string_segment_t { - std::move(new_segment_string), string_segment->colour, new_segment_width - }); - current_line->width += new_segment_width; - } - - current_line = &wrapped_lines.emplace_back(); - - start_pos += last_marker_pos; - - continue; - } - } - current_line->segments.emplace_back(string_segment_t { - std::move(whole_segment_string), string_segment->colour, whole_segment_width - }); - current_line->width += whole_segment_width; - break; - } - - } else { - // Currency segement on new line - line_t* current_line = &wrapped_lines.emplace_back(); - current_line->segments.push_back(std::move(segment)); - current_line->width = segment_width; - } - } - } - } - - const auto is_over_max_height = [this, &wrapped_lines, &max_content_size]() -> bool { - return wrapped_lines.size() > 1 - && wrapped_lines.size() * font->get_height(font_size) > max_content_size.height; - }; - - if (is_over_max_height()) { - do { - wrapped_lines.pop_back(); - } while (is_over_max_height()); - - static const String ELLIPSIS = "..."; - const real_t ellipsis_width = get_string_width(ELLIPSIS); - - line_t& last_line = wrapped_lines.back(); - Color last_colour = default_colour; - - while (last_line.segments.size() > 0 && last_line.width + ellipsis_width > max_content_size.width) { - if (string_segment_t* string_segment = std::get_if(&last_line.segments.back())) { - last_colour = string_segment->colour; - - String& last_string = string_segment->text; - if (last_string.length() > 1) { - last_string = last_string.substr(0, last_string.length() - 1); - - last_line.width -= string_segment->width; - string_segment->width = get_string_width(last_string); - last_line.width += string_segment->width; - } else { - last_line.width -= string_segment->width; - last_line.segments.pop_back(); - } - } else { - last_line.width -= currency_texture->get_width(); - last_line.segments.pop_back(); - } - } - - last_line.segments.push_back(string_segment_t { ELLIPSIS, last_colour, ellipsis_width }); - last_line.width += ellipsis_width; - } - - return wrapped_lines; -} - -void GUITextLabel::adjust_to_content_size() { - if (auto_adjust_to_content_size) { - adjusted_rect = {}; - - for (line_t const& line : lines) { - if (adjusted_rect.size.width < line.width) { - adjusted_rect.size.width = line.width; - } - } - - adjusted_rect.size.height = lines.size() * font->get_height(font_size); - - adjusted_rect.size += 2 * border_size; - - switch (horizontal_alignment) { - case HORIZONTAL_ALIGNMENT_CENTER: { - adjusted_rect.position.x = (max_size.width - adjusted_rect.size.width + 1.0_real) / 2.0_real; - } break; - case HORIZONTAL_ALIGNMENT_RIGHT: { - adjusted_rect.position.x = max_size.width - adjusted_rect.size.width; - } break; - case HORIZONTAL_ALIGNMENT_LEFT: - default: - break; - } - } else { - adjusted_rect = { {}, max_size }; - } -} diff --git a/extension/src/openvic-extension/classes/GUITextLabel.hpp b/extension/src/openvic-extension/classes/GUITextLabel.hpp deleted file mode 100644 index 7a1491c..0000000 --- a/extension/src/openvic-extension/classes/GUITextLabel.hpp +++ /dev/null @@ -1,116 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#include - -#include "openvic-extension/classes/GFXSpriteTexture.hpp" - -namespace OpenVic { - class GUITextLabel : public godot::Control { - GDCLASS(GUITextLabel, godot::Control) - - using colour_instructions_t = std::vector>; - - GUI::Text const* PROPERTY(gui_text); - - godot::String PROPERTY(text); - godot::Dictionary PROPERTY(substitution_dict); - godot::HorizontalAlignment PROPERTY(horizontal_alignment); - godot::Size2 PROPERTY(max_size); // Actual max size is max_size - 2 * border_size - godot::Size2 PROPERTY(border_size); // The padding between the Nodes bounding box and the text within it - godot::Rect2 PROPERTY(adjusted_rect); // Offset + size after adjustment to fit content size - bool PROPERTY_CUSTOM_PREFIX(auto_adjust_to_content_size, will); - - godot::Ref font; - int32_t PROPERTY(font_size); - godot::Color PROPERTY(default_colour); - GFX::Font::colour_codes_t const* colour_codes; - godot::Ref currency_texture; - - godot::Ref background; - - struct string_segment_t { - godot::String text; - godot::Color colour; - real_t width; - }; - using currency_segment_t = std::monostate; - using segment_t = std::variant; - struct line_t { - std::vector segments; - real_t width {}; - }; - - std::vector lines; - - bool line_update_queued; - - protected: - static void _bind_methods(); - - void _notification(int what); - - public: - GUITextLabel(); - - /* Reset gui_text to nullptr and reset current text. */ - void clear(); - /* Return the name of the GUI::Text, or an empty String if it's null. */ - godot::String get_gui_text_name() const; - /* Set the GUI::Text. */ - godot::Error set_gui_text( - GUI::Text const* new_gui_text, GFX::Font::colour_codes_t const* override_colour_codes = nullptr - ); - - void set_text(godot::String const& new_text); - - void add_substitution(godot::String const& key, godot::String const& value); - void set_substitution_dict(godot::Dictionary const& new_substitution_dict); - void clear_substitutions(); - - void set_horizontal_alignment(godot::HorizontalAlignment new_horizontal_alignment); - void set_max_size(godot::Size2 new_max_size); - void set_border_size(godot::Size2 new_border_size); - void set_auto_adjust_to_content_size(bool new_auto_adjust_to_content_size); - - godot::Ref get_font() const; - void set_font(godot::Ref const& new_font); - godot::Error set_font_file(godot::Ref const& new_font_file); - godot::Error set_font_size(int32_t new_font_size); - void set_default_colour(godot::Color const& new_default_colour); - - godot::Ref get_currency_texture() const; - - godot::Ref get_background() const; - void set_background_texture(godot::Ref const& new_texture); - void set_background_stylebox(godot::Ref const& new_stylebox_texture); - - private: - void update_stylebox_border_size(); - real_t get_string_width(godot::String const& string) const; - real_t get_segment_width(segment_t const& segment) const; - - void _queue_line_update(); - void _update_lines(); - - godot::String generate_substituted_text(godot::String const& base_text) const; - std::pair generate_display_text_and_colour_instructions( - godot::String const& substituted_text - ) const; - std::vector generate_lines_and_segments( - godot::String const& display_text, colour_instructions_t const& colour_instructions - ) const; - void separate_lines( - godot::String const& string, godot::Color const& colour, std::vector& lines - ) const; - void separate_currency_segments( - godot::String const& string, godot::Color const& colour, line_t& line - ) const; - std::vector wrap_lines(std::vector& unwrapped_lines) const; - void adjust_to_content_size(); - }; -} diff --git a/extension/src/openvic-extension/register_types.cpp b/extension/src/openvic-extension/register_types.cpp index eb58cb0..bd50e34 100644 --- a/extension/src/openvic-extension/register_types.cpp +++ b/extension/src/openvic-extension/register_types.cpp @@ -6,11 +6,11 @@ #include "openvic-extension/classes/GFXSpriteTexture.hpp" #include "openvic-extension/classes/GFXMaskedFlagTexture.hpp" #include "openvic-extension/classes/GFXPieChartTexture.hpp" +#include "openvic-extension/classes/GUILabel.hpp" #include "openvic-extension/classes/GUIListBox.hpp" #include "openvic-extension/classes/GUINode.hpp" #include "openvic-extension/classes/GUIOverlappingElementsBox.hpp" #include "openvic-extension/classes/GUIScrollbar.hpp" -#include "openvic-extension/classes/GUITextLabel.hpp" #include "openvic-extension/classes/MapMesh.hpp" #include "openvic-extension/singletons/AssetManager.hpp" #include "openvic-extension/singletons/Checksum.hpp" @@ -76,11 +76,11 @@ void initialize_openvic_types(ModuleInitializationLevel p_level) { ClassDB::register_class(); ClassDB::register_class(); + ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); - ClassDB::register_class(); } void uninitialize_openvic_types(ModuleInitializationLevel p_level) { diff --git a/extension/src/openvic-extension/utility/UITools.cpp b/extension/src/openvic-extension/utility/UITools.cpp index 3fcc837..723fb24 100644 --- a/extension/src/openvic-extension/utility/UITools.cpp +++ b/extension/src/openvic-extension/utility/UITools.cpp @@ -15,10 +15,10 @@ #include "openvic-extension/classes/GFXSpriteTexture.hpp" #include "openvic-extension/classes/GFXMaskedFlagTexture.hpp" #include "openvic-extension/classes/GFXPieChartTexture.hpp" +#include "openvic-extension/classes/GUILabel.hpp" #include "openvic-extension/classes/GUIListBox.hpp" #include "openvic-extension/classes/GUIOverlappingElementsBox.hpp" #include "openvic-extension/classes/GUIScrollbar.hpp" -#include "openvic-extension/classes/GUITextLabel.hpp" #include "openvic-extension/singletons/AssetManager.hpp" #include "openvic-extension/singletons/GameSingleton.hpp" #include "openvic-extension/utility/Utilities.hpp" @@ -504,22 +504,22 @@ static bool generate_text(generate_gui_args_t&& args) { const String text_name = Utilities::std_to_godot_string(text.get_name()); - GUITextLabel* text_label = nullptr; - bool ret = new_control(text_label, text, args.name); - ERR_FAIL_NULL_V_MSG(text_label, false, vformat("Failed to create GUITextLabel for GUI text %s", text_name)); + GUILabel* gui_label = nullptr; + bool ret = new_control(gui_label, text, args.name); + ERR_FAIL_NULL_V_MSG(gui_label, false, vformat("Failed to create GUILabel for GUI text %s", text_name)); - text_label->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); + gui_label->set_mouse_filter(Control::MOUSE_FILTER_IGNORE); GameSingleton const* game_singleton = GameSingleton::get_singleton(); GFX::Font::colour_codes_t const* override_colour_codes = game_singleton != nullptr ? &game_singleton->get_definition_manager().get_ui_manager().get_universal_colour_codes() : nullptr; - if (text_label->set_gui_text(&text, override_colour_codes) != OK) { - UtilityFunctions::push_error("Error initialising GUITextLabel for GUI text ", text_name); + if (gui_label->set_gui_text(&text, override_colour_codes) != OK) { + UtilityFunctions::push_error("Error initialising GUILabel for GUI text ", text_name); ret = false; } - args.result = text_label; + args.result = gui_label; return ret; } diff --git a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd index 90df650..20eb198 100644 --- a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd +++ b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd @@ -4,36 +4,36 @@ var _active : bool = false var _incVal : int = 0 # incremental value to see the UI update, replace later by real values # income -var _lower_class_label : GUITextLabel -var _middle_class_label : GUITextLabel -var _upper_class_label : GUITextLabel -var _gold_label : GUITextLabel -var _total_inc_label : GUITextLabel +var _lower_class_label : GUILabel +var _middle_class_label : GUILabel +var _upper_class_label : GUILabel +var _gold_label : GUILabel +var _total_inc_label : GUILabel # debt -var _national_bank_label : GUITextLabel -var _total_funds_label : GUITextLabel -var _debt_val_label : GUITextLabel -var _interest_val_label : GUITextLabel +var _national_bank_label : GUILabel +var _total_funds_label : GUILabel +var _debt_val_label : GUILabel +var _interest_val_label : GUILabel # costs -var _nat_stock_val_label : GUITextLabel -var _nat_stock_exp_label : GUITextLabel -var _mil_cost_val_label : GUITextLabel -var _overseas_cost_val_label : GUITextLabel -var _ind_sub_val_label : GUITextLabel -var _admin_efficiency_label : GUITextLabel -var _education_exp_label : GUITextLabel -var _administration_exp_label : GUITextLabel -var _social_exp_label : GUITextLabel -var _military_exp_label : GUITextLabel -var _total_exp_label : GUITextLabel +var _nat_stock_val_label : GUILabel +var _nat_stock_exp_label : GUILabel +var _mil_cost_val_label : GUILabel +var _overseas_cost_val_label : GUILabel +var _ind_sub_val_label : GUILabel +var _admin_efficiency_label : GUILabel +var _education_exp_label : GUILabel +var _administration_exp_label : GUILabel +var _social_exp_label : GUILabel +var _military_exp_label : GUILabel +var _total_exp_label : GUILabel # others -var _tariffs_percent_label : GUITextLabel -var _tariff_val_label : GUITextLabel -var _diplomatic_balance_label : GUITextLabel -var _balance_label : GUITextLabel +var _tariffs_percent_label : GUILabel +var _tariff_val_label : GUILabel +var _diplomatic_balance_label : GUILabel +var _balance_label : GUILabel var _lower_class_chart : GFXPieChartTexture var _middle_class_chart : GFXPieChartTexture @@ -55,33 +55,33 @@ func _ready() -> void: # labels # income - _lower_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_0_inc") - _middle_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_1_inc") - _upper_class_label = get_gui_text_label_from_nodepath(^"./country_budget/tax_2_inc") - _gold_label = get_gui_text_label_from_nodepath(^"./country_budget/gold_inc") - _total_inc_label = get_gui_text_label_from_nodepath(^"./country_budget/total_inc") + _lower_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_0_inc") + _middle_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_1_inc") + _upper_class_label = get_gui_label_from_nodepath(^"./country_budget/tax_2_inc") + _gold_label = get_gui_label_from_nodepath(^"./country_budget/gold_inc") + _total_inc_label = get_gui_label_from_nodepath(^"./country_budget/total_inc") # debt - _national_bank_label = get_gui_text_label_from_nodepath(^"./country_budget/national_bank_val") - _total_funds_label = get_gui_text_label_from_nodepath(^"./country_budget/total_funds_val") - _debt_val_label = get_gui_text_label_from_nodepath(^"./country_budget/debt_val") - _interest_val_label = get_gui_text_label_from_nodepath(^"./country_budget/interest_val") + _national_bank_label = get_gui_label_from_nodepath(^"./country_budget/national_bank_val") + _total_funds_label = get_gui_label_from_nodepath(^"./country_budget/total_funds_val") + _debt_val_label = get_gui_label_from_nodepath(^"./country_budget/debt_val") + _interest_val_label = get_gui_label_from_nodepath(^"./country_budget/interest_val") # costs - _nat_stock_val_label = get_gui_text_label_from_nodepath(^"./country_budget/nat_stock_val") - _nat_stock_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/nat_stock_est") - _mil_cost_val_label = get_gui_text_label_from_nodepath(^"./country_budget/mil_cost_val") - _overseas_cost_val_label = get_gui_text_label_from_nodepath(^"./country_budget/overseas_cost_val") - _ind_sub_val_label = get_gui_text_label_from_nodepath(^"./country_budget/ind_sub_val") - _admin_efficiency_label = get_gui_text_label_from_nodepath(^"./country_budget/admin_efficiency") - _education_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_0") - _administration_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_1") - _social_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_2") - _military_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/exp_val_3") - _total_exp_label = get_gui_text_label_from_nodepath(^"./country_budget/total_exp") + _nat_stock_val_label = get_gui_label_from_nodepath(^"./country_budget/nat_stock_val") + _nat_stock_exp_label = get_gui_label_from_nodepath(^"./country_budget/nat_stock_est") + _mil_cost_val_label = get_gui_label_from_nodepath(^"./country_budget/mil_cost_val") + _overseas_cost_val_label = get_gui_label_from_nodepath(^"./country_budget/overseas_cost_val") + _ind_sub_val_label = get_gui_label_from_nodepath(^"./country_budget/ind_sub_val") + _admin_efficiency_label = get_gui_label_from_nodepath(^"./country_budget/admin_efficiency") + _education_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_0") + _administration_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_1") + _social_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_2") + _military_exp_label = get_gui_label_from_nodepath(^"./country_budget/exp_val_3") + _total_exp_label = get_gui_label_from_nodepath(^"./country_budget/total_exp") # others - _tariffs_percent_label = get_gui_text_label_from_nodepath(^"./country_budget/tariffs_percent") - _tariff_val_label = get_gui_text_label_from_nodepath(^"./country_budget/tariff_val") - _diplomatic_balance_label = get_gui_text_label_from_nodepath(^"./country_budget/diplomatic_balance") - _balance_label = get_gui_text_label_from_nodepath(^"./country_budget/balance") + _tariffs_percent_label = get_gui_label_from_nodepath(^"./country_budget/tariffs_percent") + _tariff_val_label = get_gui_label_from_nodepath(^"./country_budget/tariff_val") + _diplomatic_balance_label = get_gui_label_from_nodepath(^"./country_budget/diplomatic_balance") + _balance_label = get_gui_label_from_nodepath(^"./country_budget/balance") # sliders # income diff --git a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd index 92ae6e2..e078934 100644 --- a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd +++ b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd @@ -14,8 +14,8 @@ var _province_list_types : Array[MenuSingleton.ProvinceListEntry] var _province_list_indices : PackedInt32Array var _province_list_panels : Array[Panel] var _province_list_button_icons : Array[GFXSpriteTexture] -var _province_list_name_labels : Array[GUITextLabel] -var _province_list_size_labels : Array[GUITextLabel] +var _province_list_name_labels : Array[GUILabel] +var _province_list_size_labels : Array[GUILabel] var _province_list_growth_icons : Array[GFXSpriteTexture] var _province_list_colony_buttons : Array[Button] var _province_list_national_focus_icons : Array[GFXSpriteTexture] @@ -33,19 +33,19 @@ var _pop_list_scrollbar : GUIScrollbar var _pop_list_scroll_index : int = 0 var _pop_list_rows : Array[Panel] -var _pop_list_size_labels : Array[GUITextLabel] +var _pop_list_size_labels : Array[GUILabel] var _pop_list_type_buttons : Array[Button] var _pop_list_type_icons : Array[GFXSpriteTexture] var _pop_list_producing_icons : Array[GFXSpriteTexture] -var _pop_list_culture_labels : Array[GUITextLabel] +var _pop_list_culture_labels : Array[GUILabel] var _pop_list_religion_icons : Array[GFXSpriteTexture] -var _pop_list_location_labels : Array[GUITextLabel] -var _pop_list_militancy_labels : Array[GUITextLabel] -var _pop_list_consciousness_labels : Array[GUITextLabel] +var _pop_list_location_labels : Array[GUILabel] +var _pop_list_militancy_labels : Array[GUILabel] +var _pop_list_consciousness_labels : Array[GUILabel] var _pop_list_ideology_charts : Array[GFXPieChartTexture] var _pop_list_issues_charts : Array[GFXPieChartTexture] var _pop_list_unemployment_progressbars : Array[TextureProgressBar] -var _pop_list_cash_labels : Array[GUITextLabel] +var _pop_list_cash_labels : Array[GUILabel] var _pop_list_life_needs_progressbars : Array[TextureProgressBar] var _pop_list_everyday_needs_progressbars : Array[TextureProgressBar] var _pop_list_luxury_needs_progressbars : Array[TextureProgressBar] @@ -58,7 +58,7 @@ var _pop_list_political_movement_icons : Array[GFXSpriteTexture] var _pop_list_national_movement_texture_rects : Array[TextureRect] var _pop_list_national_movement_flags : Array[GFXMaskedFlagTexture] var _pop_list_size_change_icons : Array[GFXSpriteTexture] -var _pop_list_literacy_labels : Array[GUITextLabel] +var _pop_list_literacy_labels : Array[GUILabel] func _ready() -> void: GameSingleton.gamestate_updated.connect(_update_info) @@ -142,9 +142,9 @@ func _generate_province_list_row(index : int, type : MenuSingleton.ProvinceListE ) _province_list_button_icons[index] = GUINode.get_gfx_sprite_texture_from_node(base_button) - _province_list_name_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_name")) + _province_list_name_labels[index] = GUINode.get_gui_label_from_node(entry_panel.get_node(^"./poplist_name")) - _province_list_size_labels[index] = GUINode.get_gui_text_label_from_node(entry_panel.get_node(^"./poplist_numpops")) + _province_list_size_labels[index] = GUINode.get_gui_label_from_node(entry_panel.get_node(^"./poplist_numpops")) _province_list_growth_icons[index] = GUINode.get_gfx_sprite_texture_from_node(entry_panel.get_node(^"./growth_indicator")) @@ -273,7 +273,7 @@ func _setup_distribution_windows() -> void: _pop_screen_panel.add_child(distribution_panel) distribution_panel.set_position(distribution_start + distribution_step * Vector2(index % columns, index / columns)) - var name_label : GUITextLabel = GUINode.get_gui_text_label_from_node(distribution_panel.get_node(^"./item_name")) + var name_label : GUILabel = GUINode.get_gui_label_from_node(distribution_panel.get_node(^"./item_name")) if name_label: name_label.set_text(distribution_names[index]) @@ -318,7 +318,7 @@ func _setup_pop_list() -> void: height += pop_row_panel.size.y _pop_list_rows.push_back(pop_row_panel) - _pop_list_size_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_size"))) + _pop_list_size_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_size"))) var pop_type_button : Button = GUINode.get_button_from_node(pop_row_panel.get_node(^"./pop_type")) # TODO - open pop details menu on pop type button press @@ -328,17 +328,17 @@ func _setup_pop_list() -> void: _pop_list_producing_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_producing_icon"))) - var culture_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_nation")) + var culture_label : GUILabel = GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_nation")) _pop_list_culture_labels.push_back(culture_label) _pop_list_religion_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./pop_religion"))) - var location_label : GUITextLabel = GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_location")) + var location_label : GUILabel = GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_location")) _pop_list_location_labels.push_back(location_label) - _pop_list_militancy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_mil"))) + _pop_list_militancy_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_mil"))) - _pop_list_consciousness_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_con"))) + _pop_list_consciousness_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_con"))) _pop_list_ideology_charts.push_back(GUINode.get_gfx_pie_chart_texture_from_node(pop_row_panel.get_node(^"./pop_ideology"))) @@ -346,7 +346,7 @@ func _setup_pop_list() -> void: _pop_list_unemployment_progressbars.push_back(GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./pop_unemployment_bar"))) - _pop_list_cash_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_cash"))) + _pop_list_cash_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_cash"))) var pop_list_life_needs_progressbar : TextureProgressBar = GUINode.get_progress_bar_from_node(pop_row_panel.get_node(^"./lifeneed_progress")) if pop_list_life_needs_progressbar: @@ -390,7 +390,7 @@ func _setup_pop_list() -> void: _pop_list_size_change_icons.push_back(GUINode.get_gfx_sprite_texture_from_node(pop_row_panel.get_node(^"./growth_indicator"))) - _pop_list_literacy_labels.push_back(GUINode.get_gui_text_label_from_node(pop_row_panel.get_node(^"./pop_literacy"))) + _pop_list_literacy_labels.push_back(GUINode.get_gui_label_from_node(pop_row_panel.get_node(^"./pop_literacy"))) func _notification(what : int) -> void: match what: @@ -546,11 +546,11 @@ func _update_distributions(): if colour_icon_rect: colour_icon_rect.set_modulate(distribution_row[slice_colour_key]) - var identifier_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_title")) + var identifier_label : GUILabel = GUINode.get_gui_label_from_node(child.get_node(^"./legend_title")) if identifier_label: identifier_label.set_text(distribution_row[slice_identifier_key]) - var weight_label : GUITextLabel = GUINode.get_gui_text_label_from_node(child.get_node(^"./legend_value")) + var weight_label : GUILabel = GUINode.get_gui_label_from_node(child.get_node(^"./legend_value")) if weight_label: weight_label.set_text("%s%%" % GUINode.float_to_string_dp(distribution_row[slice_weight_key] * 100.0, 1)) diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel.gd index f953c56..f2669c0 100644 --- a/game/src/Game/GameSession/ProvinceOverviewPanel.gd +++ b/game/src/Game/GameSession/ProvinceOverviewPanel.gd @@ -1,13 +1,13 @@ extends GUINode # Header -var _province_name_label : GUITextLabel -var _state_name_label : GUITextLabel +var _province_name_label : GUILabel +var _state_name_label : GUILabel var _slave_status_icon : TextureRect var _colony_status_button : Button var _colony_status_button_texture : GFXSpriteTexture -var _administrative_percentage_label : GUITextLabel -var _owner_percentage_label : GUITextLabel +var _administrative_percentage_label : GUILabel +var _owner_percentage_label : GUILabel var _province_modifiers_overlapping_elements_box : GUIOverlappingElementsBox var _terrain_type_texture : GFXSpriteTexture var _life_rating_bar : TextureProgressBar @@ -15,21 +15,21 @@ var _controller_flag_texture : GFXMaskedFlagTexture # Statistics var _rgo_icon_texture : GFXSpriteTexture -var _rgo_produced_label : GUITextLabel -var _rgo_income_label : GUITextLabel +var _rgo_produced_label : GUILabel +var _rgo_income_label : GUILabel var _rgo_employment_percentage_texture : GFXSpriteTexture -var _rgo_employment_population_label : GUITextLabel -var _rgo_employment_percentage_label : GUITextLabel -var _crime_name_label : GUITextLabel +var _rgo_employment_population_label : GUILabel +var _rgo_employment_percentage_label : GUILabel +var _crime_name_label : GUILabel var _crime_icon_texture : GFXSpriteTexture -var _crime_fighting_label : GUITextLabel -var _total_population_label : GUITextLabel -var _migration_label : GUITextLabel -var _population_growth_label : GUITextLabel +var _crime_fighting_label : GUILabel +var _total_population_label : GUILabel +var _migration_label : GUILabel +var _population_growth_label : GUILabel var _pop_types_piechart : GFXPieChartTexture var _pop_ideologies_piechart : GFXPieChartTexture var _pop_cultures_piechart : GFXPieChartTexture -var _supply_limit_label : GUITextLabel +var _supply_limit_label : GUILabel var _cores_overlapping_elements_box : GUIOverlappingElementsBox # Buildings @@ -48,7 +48,7 @@ class BuildingSlot: var _expand_button : Button var _expanding_icon : TextureRect var _expanding_progress_bar : TextureProgressBar - var _expanding_label : GUITextLabel + var _expanding_label : GUILabel func _init(new_slot_index : int, new_slot_node : Control) -> void: if new_slot_index < 0: @@ -68,7 +68,7 @@ class BuildingSlot: else: icon.hide() - var building_name := GUINode.get_gui_text_label_from_node(_slot_node.get_node(^"./description")) + var building_name := GUINode.get_gui_label_from_node(_slot_node.get_node(^"./description")) if building_name: building_name.text = MenuSingleton.get_province_building_identifier(_slot_index) _expand_button = GUINode.get_button_from_node(_slot_node.get_node(^"./expand")) @@ -79,7 +79,7 @@ class BuildingSlot: if _expanding_progress_bar: _expanding_progress_bar.max_value = 1.0 _expanding_progress_bar.step = _expanding_progress_bar.max_value / 100 - _expanding_label = GUINode.get_gui_text_label_from_node(_slot_node.get_node(^"./expand_text")) + _expanding_label = GUINode.get_gui_label_from_node(_slot_node.get_node(^"./expand_text")) enum ExpansionState { CannotExpand, CanExpand, Preparing, Expanding } @@ -136,8 +136,8 @@ func _ready() -> void: close_button.pressed.connect(_on_close_button_pressed) # Header - _province_name_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/province_name") - _state_name_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/state_name") + _province_name_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/province_name") + _state_name_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/state_name") if _state_name_label: # State names are already translated in the MenuSingleton _state_name_label.auto_translate = false @@ -150,8 +150,8 @@ func _ready() -> void: var admin_icon_texture : GFXSpriteTexture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_view_header/admin_icon") if admin_icon_texture: admin_icon_texture.set_icon_index(MenuSingleton.get_administrative_pop_icon_index()) - _administrative_percentage_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/admin_efficiency") - _owner_percentage_label = get_gui_text_label_from_nodepath(^"./province_view/province_view_header/owner_presence") + _administrative_percentage_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/admin_efficiency") + _owner_percentage_label = get_gui_label_from_nodepath(^"./province_view/province_view_header/owner_presence") _province_modifiers_overlapping_elements_box = get_gui_overlapping_elements_box_from_nodepath(^"./province_view/province_view_header/province_modifiers") if _province_modifiers_overlapping_elements_box and _province_modifiers_overlapping_elements_box.set_gui_child_element_name("province_interface", "prov_state_modifier") != OK: _province_modifiers_overlapping_elements_box = null # hide province modifiers box since we can't do anything with it @@ -161,17 +161,17 @@ func _ready() -> void: # Statistics _rgo_icon_texture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_statistics/goods_type") - _rgo_produced_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/produced") - _rgo_income_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/income") + _rgo_produced_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/produced") + _rgo_income_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/income") _rgo_employment_percentage_texture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_statistics/employment_ratio") - _rgo_employment_population_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/rgo_population") - _rgo_employment_percentage_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/rgo_percent") - _crime_name_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/crime_name") + _rgo_employment_population_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/rgo_population") + _rgo_employment_percentage_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/rgo_percent") + _crime_name_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/crime_name") _crime_icon_texture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_statistics/crime_icon") - _crime_fighting_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/crimefight_percent") - _total_population_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/total_population") - _migration_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/migration") - _population_growth_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/growth") + _crime_fighting_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/crimefight_percent") + _total_population_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/total_population") + _migration_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/migration") + _population_growth_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/growth") _pop_types_piechart = get_gfx_pie_chart_texture_from_nodepath(^"./province_view/province_statistics/workforce_chart") _pop_ideologies_piechart = get_gfx_pie_chart_texture_from_nodepath(^"./province_view/province_statistics/ideology_chart") _pop_cultures_piechart = get_gfx_pie_chart_texture_from_nodepath(^"./province_view/province_statistics/culture_chart") @@ -183,7 +183,7 @@ func _ready() -> void: _on_close_button_pressed() Events.NationManagementScreens.open_nation_management_screen(NationManagement.Screen.POPULATION) ) - _supply_limit_label = get_gui_text_label_from_nodepath(^"./province_view/province_statistics/supply_limit_label") + _supply_limit_label = get_gui_label_from_nodepath(^"./province_view/province_statistics/supply_limit_label") _cores_overlapping_elements_box = get_gui_overlapping_elements_box_from_nodepath(^"./province_view/province_statistics/core_icons") if _cores_overlapping_elements_box and _cores_overlapping_elements_box.set_gui_child_element_name("province_interface", "province_core") != OK: _cores_overlapping_elements_box = null # hide cores box since we can't do anything with it diff --git a/game/src/Game/GameSession/Topbar.gd b/game/src/Game/GameSession/Topbar.gd index a173ccd..d6cc358 100644 --- a/game/src/Game/GameSession/Topbar.gd +++ b/game/src/Game/GameSession/Topbar.gd @@ -3,21 +3,21 @@ extends GUINode # Country info var _country_flag_texture : GFXMaskedFlagTexture var _country_flag_overlay_texture : GFXSpriteTexture -var _country_name_label : GUITextLabel -var _country_rank_label : GUITextLabel -var _country_prestige_label : GUITextLabel -var _country_prestige_rank_label : GUITextLabel -var _country_industrial_power_label : GUITextLabel -var _country_industrial_power_rank_label : GUITextLabel -var _country_military_power_label : GUITextLabel -var _country_military_power_rank_label : GUITextLabel -var _country_colonial_power_label : GUITextLabel +var _country_name_label : GUILabel +var _country_rank_label : GUILabel +var _country_prestige_label : GUILabel +var _country_prestige_rank_label : GUILabel +var _country_industrial_power_label : GUILabel +var _country_industrial_power_rank_label : GUILabel +var _country_military_power_label : GUILabel +var _country_military_power_rank_label : GUILabel +var _country_colonial_power_label : GUILabel # Time controls var _speed_up_button : Button var _speed_down_button : Button var _speed_indicator_texture : GFXSpriteTexture -var _date_label : GUITextLabel +var _date_label : GUILabel # NationManagement.Screen-Button var _nation_management_buttons : Dictionary @@ -32,48 +32,48 @@ var _production_alert_unemployment_texture : GFXSpriteTexture # Budget # TODO - line chart -var _budget_funds_label : GUITextLabel +var _budget_funds_label : GUILabel # Technology var _technology_progress_bar : TextureProgressBar -var _technology_current_research_label : GUITextLabel -var _technology_literacy_label : GUITextLabel -var _technology_research_points_label : GUITextLabel +var _technology_current_research_label : GUILabel +var _technology_literacy_label : GUILabel +var _technology_research_points_label : GUILabel # Politics var _politics_party_icon : TextureRect -var _politics_party_label : GUITextLabel -var _politics_suppression_points_label : GUITextLabel -var _politics_infamy_label : GUITextLabel +var _politics_party_label : GUILabel +var _politics_suppression_points_label : GUILabel +var _politics_infamy_label : GUILabel var _politics_reforms_texture : GFXSpriteTexture var _politics_decisions_texture : GFXSpriteTexture var _politics_election_texture : GFXSpriteTexture var _politics_rebels_texture : GFXSpriteTexture # Population -var _population_total_size_label : GUITextLabel -var _population_national_foci_label : GUITextLabel -var _population_militancy_label : GUITextLabel -var _population_consciousness_label : GUITextLabel +var _population_total_size_label : GUILabel +var _population_national_foci_label : GUILabel +var _population_militancy_label : GUILabel +var _population_consciousness_label : GUILabel # Trade var _trade_imported_textures : Array[GFXSpriteTexture] var _trade_exported_textures : Array[GFXSpriteTexture] # Diplomacy -var _diplomacy_peace_label : GUITextLabel +var _diplomacy_peace_label : GUILabel var _diplomacy_war_enemies_overlapping_elements_box : GUIOverlappingElementsBox -var _diplomacy_diplomatic_points_label : GUITextLabel +var _diplomacy_diplomatic_points_label : GUILabel var _diplomacy_alert_colony_texture : GFXSpriteTexture var _diplomacy_alert_crisis_texture : GFXSpriteTexture var _diplomacy_alert_sphere_texture : GFXSpriteTexture var _diplomacy_alert_great_power_texture : GFXSpriteTexture # Military -var _military_army_size_label : GUITextLabel -var _military_navy_size_label : GUITextLabel -var _military_mobilisation_size_label : GUITextLabel -var _military_leadership_points_label : GUITextLabel +var _military_army_size_label : GUILabel +var _military_navy_size_label : GUILabel +var _military_mobilisation_size_label : GUILabel +var _military_leadership_points_label : GUILabel func _ready() -> void: GameSingleton.gamestate_updated.connect(_update_info) @@ -102,15 +102,15 @@ func _ready() -> void: ) _country_flag_texture = GUINode.get_gfx_masked_flag_texture_from_node(country_flag_button) _country_flag_overlay_texture = get_gfx_sprite_texture_from_nodepath(^"./topbar/topbar_flag_overlay") - _country_name_label = get_gui_text_label_from_nodepath(^"./topbar/CountryName") - _country_rank_label = get_gui_text_label_from_nodepath(^"./topbar/nation_totalrank") - _country_prestige_label = get_gui_text_label_from_nodepath(^"./topbar/country_prestige") - _country_prestige_rank_label = get_gui_text_label_from_nodepath(^"./topbar/selected_prestige_rank") - _country_industrial_power_label = get_gui_text_label_from_nodepath(^"./topbar/country_economic") - _country_industrial_power_rank_label = get_gui_text_label_from_nodepath(^"./topbar/selected_industry_rank") - _country_military_power_label = get_gui_text_label_from_nodepath(^"./topbar/country_military") - _country_military_power_rank_label = get_gui_text_label_from_nodepath(^"./topbar/selected_military_rank") - _country_colonial_power_label = get_gui_text_label_from_nodepath(^"./topbar/country_colonial_power") + _country_name_label = get_gui_label_from_nodepath(^"./topbar/CountryName") + _country_rank_label = get_gui_label_from_nodepath(^"./topbar/nation_totalrank") + _country_prestige_label = get_gui_label_from_nodepath(^"./topbar/country_prestige") + _country_prestige_rank_label = get_gui_label_from_nodepath(^"./topbar/selected_prestige_rank") + _country_industrial_power_label = get_gui_label_from_nodepath(^"./topbar/country_economic") + _country_industrial_power_rank_label = get_gui_label_from_nodepath(^"./topbar/selected_industry_rank") + _country_military_power_label = get_gui_label_from_nodepath(^"./topbar/country_military") + _country_military_power_rank_label = get_gui_label_from_nodepath(^"./topbar/selected_military_rank") + _country_colonial_power_label = get_gui_label_from_nodepath(^"./topbar/country_colonial_power") # Time controls _speed_up_button = get_button_from_nodepath(^"./topbar/button_speedup") @@ -126,7 +126,7 @@ func _ready() -> void: if speed_indicator_button: speed_indicator_button.pressed.connect(_on_play_pause_button_pressed) _speed_indicator_texture = GUINode.get_gfx_sprite_texture_from_node(speed_indicator_button) - _date_label = get_gui_text_label_from_nodepath(^"./topbar/DateText") + _date_label = get_gui_label_from_nodepath(^"./topbar/DateText") # Nation management screens const screen_nodepaths : Dictionary = { @@ -162,17 +162,17 @@ func _ready() -> void: _production_alert_unemployment_texture = get_gfx_sprite_texture_from_nodepath(^"./topbar/alert_unemployed_workers") # Budget - _budget_funds_label = get_gui_text_label_from_nodepath(^"./topbar/budget_funds") + _budget_funds_label = get_gui_label_from_nodepath(^"./topbar/budget_funds") # Technology _technology_progress_bar = get_progress_bar_from_nodepath(^"./topbar/topbar_tech_progress") - _technology_current_research_label = get_gui_text_label_from_nodepath(^"./topbar/tech_current_research") - _technology_literacy_label = get_gui_text_label_from_nodepath(^"./topbar/tech_literacy_value") - _technology_research_points_label = get_gui_text_label_from_nodepath(^"./topbar/topbar_researchpoints_value") + _technology_current_research_label = get_gui_label_from_nodepath(^"./topbar/tech_current_research") + _technology_literacy_label = get_gui_label_from_nodepath(^"./topbar/tech_literacy_value") + _technology_research_points_label = get_gui_label_from_nodepath(^"./topbar/topbar_researchpoints_value") # Politics _politics_party_icon = get_texture_rect_from_nodepath(^"./topbar/politics_party_icon") - _politics_party_label = get_gui_text_label_from_nodepath(^"./topbar/politics_ruling_party") + _politics_party_label = get_gui_label_from_nodepath(^"./topbar/politics_ruling_party") var politics_suppression_button : Button = get_button_from_nodepath(^"./topbar/topbar_supression_icon") if politics_suppression_button: politics_suppression_button.pressed.connect( @@ -180,8 +180,8 @@ func _ready() -> void: # TODO - open the politics menu on the Movements tab Events.NationManagementScreens.toggle_nation_management_screen(NationManagement.Screen.POLITICS) ) - _politics_suppression_points_label = get_gui_text_label_from_nodepath(^"./topbar/politics_supressionpoints_value") - _politics_infamy_label = get_gui_text_label_from_nodepath(^"./topbar/politics_infamy_value") + _politics_suppression_points_label = get_gui_label_from_nodepath(^"./topbar/politics_supressionpoints_value") + _politics_infamy_label = get_gui_label_from_nodepath(^"./topbar/politics_infamy_value") var politics_reforms_button : Button = get_button_from_nodepath(^"./topbar/alert_can_do_reforms") if politics_reforms_button: politics_reforms_button.pressed.connect( @@ -209,10 +209,10 @@ func _ready() -> void: _politics_rebels_texture = GUINode.get_gfx_sprite_texture_from_node(politics_rebels_button) # Population - _population_total_size_label = get_gui_text_label_from_nodepath(^"./topbar/population_total_value") - _population_national_foci_label = get_gui_text_label_from_nodepath(^"./topbar/topbar_focus_value") - _population_militancy_label = get_gui_text_label_from_nodepath(^"./topbar/population_avg_mil_value") - _population_consciousness_label = get_gui_text_label_from_nodepath(^"./topbar/population_avg_con_value") + _population_total_size_label = get_gui_label_from_nodepath(^"./topbar/population_total_value") + _population_national_foci_label = get_gui_label_from_nodepath(^"./topbar/topbar_focus_value") + _population_militancy_label = get_gui_label_from_nodepath(^"./topbar/population_avg_mil_value") + _population_consciousness_label = get_gui_label_from_nodepath(^"./topbar/population_avg_con_value") # Trade const TRADE_GOOD_COUNT : int = 3 @@ -221,9 +221,9 @@ func _ready() -> void: _trade_exported_textures.push_back(get_gfx_sprite_texture_from_nodepath("./topbar/topbar_export%d" % idx)) # Diplomacy - _diplomacy_peace_label = get_gui_text_label_from_nodepath(^"./topbar/diplomacy_status") + _diplomacy_peace_label = get_gui_label_from_nodepath(^"./topbar/diplomacy_status") _diplomacy_war_enemies_overlapping_elements_box = get_gui_overlapping_elements_box_from_nodepath(^"./topbar/diplomacy_at_war") - _diplomacy_diplomatic_points_label = get_gui_text_label_from_nodepath(^"./topbar/diplomacy_diplopoints_value") + _diplomacy_diplomatic_points_label = get_gui_label_from_nodepath(^"./topbar/diplomacy_diplopoints_value") var diplomacy_alert_colony_button : Button = get_button_from_nodepath(^"./topbar/alert_colony") if diplomacy_alert_colony_button: diplomacy_alert_colony_button.pressed.connect( @@ -237,10 +237,10 @@ func _ready() -> void: _diplomacy_alert_great_power_texture = get_gfx_sprite_texture_from_nodepath(^"./topbar/alert_loosing_gp") # Military - _military_army_size_label = get_gui_text_label_from_nodepath(^"./topbar/military_army_value") - _military_navy_size_label = get_gui_text_label_from_nodepath(^"./topbar/military_navy_value") - _military_mobilisation_size_label = get_gui_text_label_from_nodepath(^"./topbar/military_manpower_value") - _military_leadership_points_label = get_gui_text_label_from_nodepath(^"./topbar/military_leadership_value") + _military_army_size_label = get_gui_label_from_nodepath(^"./topbar/military_army_value") + _military_navy_size_label = get_gui_label_from_nodepath(^"./topbar/military_navy_value") + _military_mobilisation_size_label = get_gui_label_from_nodepath(^"./topbar/military_manpower_value") + _military_leadership_points_label = get_gui_label_from_nodepath(^"./topbar/military_leadership_value") _update_info() _update_speed_controls() -- cgit v1.2.3-56-ga3b1