From 7e2f038a8ba7d04e2ea156fdf32c35130f41e27a Mon Sep 17 00:00:00 2001 From: NaiJi Date: Mon, 16 Aug 2021 21:54:03 +0300 Subject: [PATCH] Implement main menubar for the Editor --- src/gui/editor.cpp | 27 +++++-------- src/gui/editor.h | 4 +- src/gui/widgets/bpmcalculator.cpp | 66 +++++++++++++++++++++++++++++++ src/gui/widgets/bpmcalculator.h | 27 +++++++++++++ src/gui/widgets/menubar.cpp | 52 ++++++++++++++++++++++++ src/gui/widgets/menubar.h | 27 +++++++++++++ src/gui/widgets/menubutton.h | 22 +++++++++++ src/gui/widgets/menudrop.cpp | 44 +++++++++++++++++++++ src/gui/widgets/menudrop.h | 23 +++++++++++ 9 files changed, 272 insertions(+), 20 deletions(-) create mode 100644 src/gui/widgets/bpmcalculator.cpp create mode 100644 src/gui/widgets/bpmcalculator.h create mode 100644 src/gui/widgets/menubar.cpp create mode 100644 src/gui/widgets/menubar.h create mode 100644 src/gui/widgets/menubutton.h create mode 100644 src/gui/widgets/menudrop.cpp create mode 100644 src/gui/widgets/menudrop.h diff --git a/src/gui/editor.cpp b/src/gui/editor.cpp index 8b71126..2941975 100644 --- a/src/gui/editor.cpp +++ b/src/gui/editor.cpp @@ -1,36 +1,27 @@ #include "editor.h" #include "widgets/button.h" #include "widgets/group.h" +#include "widgets/menubar.h" #include "tools/bpmcalculator.h" #include Editor::Editor(sf::RenderWindow& game_window, Callbacks&& callbacks, std::unique_ptr&& music) : - _buttons(std::make_shared()), + _menu_bar(std::make_shared()), _game_window(game_window), _music(std::move(music)), _bpm_calculator(std::make_unique(_music)) { (void)callbacks; const float window_width = game_window.getSize().x; - const float window_height = game_window.getSize().y; + //const float window_height = game_window.getSize().y; - _music->openFromFile("Uta-test.flac"); - _music->setVolume(20); - - std::shared_ptr