AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-23 03:47:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove local wrapper of MyGUI::Scrollbar

Browse Source
This commit is contained in:
Andrew Lanzone 2025-07-26 23:54:25 -07:00
parent 24c7a3f1ce
commit 360c801b73
12 changed files with 8 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwgui/countdialog.cpp
View File

@ -5,7 +5,6 @@
#include <MyGUI_ScrollBar.h> #include <MyGUI_ScrollBar.h>
#include <components/widgets/numericeditbox.hpp> #include <components/widgets/numericeditbox.hpp>
#include <components/widgets/scrollbar.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"

3
apps/openmw/mwgui/countdialog.hpp
View File

@ -6,7 +6,6 @@
namespace Gui namespace Gui
{ {
class NumericEditBox; class NumericEditBox;
class ScrollBar;
} }
namespace MWGui namespace MWGui
@ -24,7 +23,7 @@ namespace MWGui
MyGUI::delegates::MultiDelegate<MyGUI::Widget*, std::size_t> eventOkClicked; MyGUI::delegates::MultiDelegate<MyGUI::Widget*, std::size_t> eventOkClicked;
private: private:
Gui::ScrollBar* mSlider; MyGUI::ScrollBar* mSlider;
Gui::NumericEditBox* mItemEdit; Gui::NumericEditBox* mItemEdit;
MyGUI::TextBox* mItemText; MyGUI::TextBox* mItemText;
MyGUI::TextBox* mLabelText; MyGUI::TextBox* mLabelText;

1
apps/openmw/mwgui/race.cpp
View File

@ -13,7 +13,6 @@
#include <components/esm3/loadrace.hpp> #include <components/esm3/loadrace.hpp>
#include <components/myguiplatform/myguitexture.hpp> #include <components/myguiplatform/myguitexture.hpp>
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
#include <components/widgets/scrollbar.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"

7
apps/openmw/mwgui/race.hpp
View File

@ -25,11 +25,6 @@ namespace Resource
class ResourceSystem; class ResourceSystem;
} }
namespace Gui
{
class ScrollBar;
}
namespace MWGui namespace MWGui
{ {
class RaceDialog : public WindowModal class RaceDialog : public WindowModal
@ -105,7 +100,7 @@ namespace MWGui
MyGUI::ImageBox* mPreviewImage; MyGUI::ImageBox* mPreviewImage;
MyGUI::ListBox* mRaceList; MyGUI::ListBox* mRaceList;
Gui::ScrollBar* mHeadRotate; MyGUI::ScrollBar* mHeadRotate;
MyGUI::Button* mBackButton; MyGUI::Button* mBackButton;
MyGUI::Button* mOkButton; MyGUI::Button* mOkButton;

1
apps/openmw/mwgui/spellcreationdialog.cpp
View File

@ -9,7 +9,6 @@
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
#include <components/widgets/list.hpp> #include <components/widgets/list.hpp>
#include <components/widgets/scrollbar.hpp>
#include <components/esm3/loadgmst.hpp> #include <components/esm3/loadgmst.hpp>

9
apps/openmw/mwgui/spellcreationdialog.hpp
View File

@ -13,7 +13,6 @@
namespace Gui namespace Gui
{ {
class MWList; class MWList;
class ScrollBar;
} }
namespace MWGui namespace MWGui
@ -59,10 +58,10 @@ namespace MWGui
MyGUI::TextBox* mDurationValue; MyGUI::TextBox* mDurationValue;
MyGUI::TextBox* mAreaValue; MyGUI::TextBox* mAreaValue;
Gui::ScrollBar* mMagnitudeMinSlider; MyGUI::ScrollBar* mMagnitudeMinSlider;
Gui::ScrollBar* mMagnitudeMaxSlider; MyGUI::ScrollBar* mMagnitudeMaxSlider;
Gui::ScrollBar* mDurationSlider; MyGUI::ScrollBar* mDurationSlider;
Gui::ScrollBar* mAreaSlider; MyGUI::ScrollBar* mAreaSlider;
MyGUI::TextBox* mAreaText; MyGUI::TextBox* mAreaText;

1
apps/openmw/mwgui/waitdialog.cpp
View File

@ -10,7 +10,6 @@
#include <components/misc/strings/format.hpp> #include <components/misc/strings/format.hpp>
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
#include <components/widgets/box.hpp> #include <components/widgets/box.hpp>
#include <components/widgets/scrollbar.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/mechanicsmanager.hpp"

7
apps/openmw/mwgui/waitdialog.hpp
View File

@ -5,11 +5,6 @@
#include "windowbase.hpp" #include "windowbase.hpp"
#include <components/esm/refid.hpp> #include <components/esm/refid.hpp>
namespace Gui
{
class ScrollBar;
}
namespace MWGui namespace MWGui
{ {
@ -60,7 +55,7 @@ namespace MWGui
MyGUI::Button* mUntilHealedButton; MyGUI::Button* mUntilHealedButton;
MyGUI::Button* mWaitButton; MyGUI::Button* mWaitButton;
MyGUI::Button* mCancelButton; MyGUI::Button* mCancelButton;
Gui::ScrollBar* mHourSlider; MyGUI::ScrollBar* mHourSlider;
TimeAdvancer mTimeAdvancer; TimeAdvancer mTimeAdvancer;
bool mSleeping; bool mSleeping;

2
components/CMakeLists.txt
View File

@ -354,7 +354,7 @@ add_component_dir (myguiplatform
) )
add_component_dir (widgets add_component_dir (widgets
box fontwrapper imagebutton tags list numericeditbox scrollbar sharedstatebutton windowcaption widgets box fontwrapper imagebutton tags list numericeditbox sharedstatebutton windowcaption widgets
) )
add_component_dir (fontloader add_component_dir (fontloader

17
components/widgets/scrollbar.cpp
View File

@ -1,17 +0,0 @@
#include "scrollbar.hpp"
#include <MyGUI_Button.h>
namespace Gui
{
std::vector<MyGUI::Widget*> ScrollBar::getAllWidgets()
{
std::vector<MyGUI::Widget*> widgets;
widgets.push_back(mWidgetStart);
widgets.push_back(mWidgetEnd);
widgets.push_back(mWidgetTrack);
widgets.push_back(mWidgetFirstPart);
widgets.push_back(mWidgetSecondPart);
return widgets;
}
}

18
components/widgets/scrollbar.hpp
View File

@ -1,18 +0,0 @@
#ifndef OPENMW_COMPONENTS_WIDGETS_SCROLLBAR_H
#define OPENMW_COMPONENTS_WIDGETS_SCROLLBAR_H
#include <MyGUI_ScrollBar.h>
namespace Gui
{
/// @brief A scrollbar that can return all its widgets for binding hover listeners.
class ScrollBar : public MyGUI::ScrollBar
{
MYGUI_RTTI_DERIVED(ScrollBar)
public:
std::vector<MyGUI::Widget*> getAllWidgets();
};
}
#endif

2
components/widgets/widgets.cpp
View File

@ -6,7 +6,6 @@
#include "imagebutton.hpp" #include "imagebutton.hpp"
#include "list.hpp" #include "list.hpp"
#include "numericeditbox.hpp" #include "numericeditbox.hpp"
#include "scrollbar.hpp"
#include "sharedstatebutton.hpp" #include "sharedstatebutton.hpp"
#include "windowcaption.hpp" #include "windowcaption.hpp"
@ -27,7 +26,6 @@ namespace Gui
MyGUI::FactoryManager::getInstance().registerFactory<Gui::Button>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::Button>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::ImageButton>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::ImageButton>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::NumericEditBox>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::NumericEditBox>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::ScrollBar>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::SharedStateButton>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::SharedStateButton>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<Gui::WindowCaption>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<Gui::WindowCaption>("Widget");
} }