openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Update to TGUI 0.9.x

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-12-28 13:03:45 -07:00
committed by Celtic Minstrel
parent 00bff78239
commit d860422c6d
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/boe.menu.cpp
View File

@@ -235,7 +235,7 @@ void OpenBoEMenu::update_for_game_state(eGameMode overall_mode, bool party_in_me
// Disconnect all spell menu items from signals and clear the menus // Disconnect all spell menu items from signals and clear the menus
void OpenBoEMenu::purge_spell_menus(tgui::MenuBar::Ptr& menubar) { void OpenBoEMenu::purge_spell_menus(tgui::MenuBar::Ptr& menubar) {
for(const auto& connection_id : this->spell_menus_connection_ids) { for(const auto& connection_id : this->spell_menus_connection_ids) {
if(!menubar->disconnect(connection_id)) if(!menubar->onMenuItemClick.disconnect(connection_id))
throw std::runtime_error { "BUG: attempted to disconnect menubar signal using invalid connection id" }; throw std::runtime_error { "BUG: attempted to disconnect menubar signal using invalid connection id" };
} }

4
src/game/boe.menu.hpp
View File

@@ -26,11 +26,11 @@ public:
private: private:
using MenuHierarchy = std::vector<sf::String>; using MenuHierarchy = std::vector<tgui::String>;
tgui::Gui tgui; tgui::Gui tgui;
cUniverse& univ; cUniverse& univ;
const sf::String internal_menubar_widget_name { "openboe-menu" }; const tgui::String internal_menubar_widget_name { "openboe-menu" };
std::vector<unsigned int> spell_menus_connection_ids; std::vector<unsigned int> spell_menus_connection_ids;
tgui::MenuBar::Ptr build_menubar() const; tgui::MenuBar::Ptr build_menubar() const;

4
src/pcedit/pc.menu.hpp
View File

@@ -17,11 +17,11 @@ public:
private: private:
using MenuHierarchy = std::vector<sf::String>; using MenuHierarchy = std::vector<tgui::String>;
tgui::Gui tgui; tgui::Gui tgui;
sf::RenderWindow& mainPtr; sf::RenderWindow& mainPtr;
const sf::String internal_menubar_widget_name { "openboe-pcedit-menu" }; const tgui::String internal_menubar_widget_name { "openboe-pcedit-menu" };
tgui::MenuBar::Ptr build_menubar() const; tgui::MenuBar::Ptr build_menubar() const;
void add_menu_placeholders(tgui::MenuBar::Ptr&) const; void add_menu_placeholders(tgui::MenuBar::Ptr&) const;

4
src/scenedit/scen.menu.hpp
View File

@@ -22,10 +22,10 @@ public:
private: private:
using MenuHierarchy = std::vector<sf::String>; using MenuHierarchy = std::vector<tgui::String>;
tgui::Gui tgui; tgui::Gui tgui;
const sf::String internal_menubar_widget_name { "openboe-scenedit-menu" }; const tgui::String internal_menubar_widget_name { "openboe-scenedit-menu" };
tgui::MenuBar::Ptr build_menubar() const; tgui::MenuBar::Ptr build_menubar() const;
void add_menu_placeholders(tgui::MenuBar::Ptr&) const; void add_menu_placeholders(tgui::MenuBar::Ptr&) const;

1
src/tools/winutil.hpp
View File

@@ -12,6 +12,7 @@
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <SFML/Window.hpp> #include <SFML/Window.hpp>
#include <SFML/Graphics/Image.hpp> #include <SFML/Graphics/Image.hpp>
#include <memory>
char keyToChar(sf::Keyboard::Key key, bool isShift); char keyToChar(sf::Keyboard::Key key, bool isShift);