From 9a086523513994b0183d5f7d479b2f82412177f6 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Mon, 14 Aug 2023 00:23:25 +0100 Subject: Fixed piechart tooltip + updated sim submodule --- extension/deps/openvic-simulation | 2 +- extension/src/GameSingleton.cpp | 4 ++-- game/src/Game/Theme/PieChart/PieChart.gd | 2 +- game/src/Game/Theme/PieChart/PieChart.tscn | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation index d3c6ff1..383ef70 160000 --- a/extension/deps/openvic-simulation +++ b/extension/deps/openvic-simulation @@ -1 +1 @@ -Subproject commit d3c6ff1809b88b4c99163402f30b6d10c787510f +Subproject commit 383ef70bea656a77e8b7c6843fd4a79705ecde49 diff --git a/extension/src/GameSingleton.cpp b/extension/src/GameSingleton.cpp index 7fc713a..18fd67a 100644 --- a/extension/src/GameSingleton.cpp +++ b/extension/src/GameSingleton.cpp @@ -85,8 +85,8 @@ void GameSingleton::_bind_methods() { ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_end_date_key"), &GameSingleton::get_building_info_end_date_key); ClassDB::bind_static_method("GameSingleton", D_METHOD("get_building_info_expansion_progress_key"), &GameSingleton::get_building_info_expansion_progress_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_culture_info_size_key"), &GameSingleton::get_piechart_info_size_key); - ClassDB::bind_static_method("GameSingleton", D_METHOD("get_culture_info_colour_key"), &GameSingleton::get_piechart_info_colour_key); + ClassDB::bind_static_method("GameSingleton", D_METHOD("get_piechart_info_size_key"), &GameSingleton::get_piechart_info_size_key); + ClassDB::bind_static_method("GameSingleton", D_METHOD("get_piechart_info_colour_key"), &GameSingleton::get_piechart_info_colour_key); ClassDB::bind_static_method("GameSingleton", D_METHOD("draw_pie_chart", "image", "stopAngles", "colours", "radius", "shadow_displacement", "shadow_tightness", "shadow_radius", "shadow_thickness", diff --git a/game/src/Game/Theme/PieChart/PieChart.gd b/game/src/Game/Theme/PieChart/PieChart.gd index 94366c7..cfd7917 100644 --- a/game/src/Game/Theme/PieChart/PieChart.gd +++ b/game/src/Game/Theme/PieChart/PieChart.gd @@ -99,7 +99,7 @@ func set_to_distribution(dist : Dictionary) -> void: clear_slices() for key in dist: var entry : Dictionary = dist[key] - _slices[key] = SliceData.new(entry[GameSingleton.get_culture_info_size_key()], key, entry[GameSingleton.get_culture_info_colour_key()]) + _slices[key] = SliceData.new(entry[GameSingleton.get_piechart_info_size_key()], key, entry[GameSingleton.get_piechart_info_colour_key()]) _slice_order = _slices.keys() sort_slices() diff --git a/game/src/Game/Theme/PieChart/PieChart.tscn b/game/src/Game/Theme/PieChart/PieChart.tscn index 18fb1f1..a0e9992 100644 --- a/game/src/Game/Theme/PieChart/PieChart.tscn +++ b/game/src/Game/Theme/PieChart/PieChart.tscn @@ -34,3 +34,5 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 + +[connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] -- cgit v1.2.3-56-ga3b1