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

Merge pull request #251 from x-qq/fix_scrollbar_segfaults

Browse Source 
fix for scrollbar segfaults

* fixes #206
* fixes broken mousewheel scrolling of the scenedit palette
* removed boost threads dependency
* added foundation for further refactoring of the drawing and event handling code: interfaces and drawable manager with layering
* removed a bunch of unneeded redraw calls
* removed some repeated recalculation of effectively constant values (boe.actions)
* removed recalculation of effectively constant scrollbar and button positions (boe.graphics)

Closes #251
This commit is contained in:
Celtic Minstrel
2020-02-09 15:55:51 -05:00
parent f141149287
commit deac7b0cb6
27 changed files with 444 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@
OpenBoEMenu::OpenBoEMenu(sf::RenderWindow& window, cUniverse& universe)
: tgui { window }
, mainPtr { window }
, univ { universe } {
// Build a menubar and store it in tgui with a known name
@@ -26,7 +25,7 @@ OpenBoEMenu::OpenBoEMenu(sf::RenderWindow& window, cUniverse& universe)
tgui::MenuBar::Ptr OpenBoEMenu::build_menubar() const {
auto menubar = tgui::MenuBar::create();
menubar->setSize(this->mainPtr.getSize().x, MENUBAR_HEIGHT);
menubar->setSize("100%", MENUBAR_HEIGHT);
this->add_menu_placeholders(menubar);
this->add_persistent_menu_items(menubar);