From 560e7029733960e75ef3655c8762e54c6a914ba3 Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 22 Mar 2012 15:23:23 +0100 Subject: [PATCH] fixed scroll bars --- apps/openmw/mwgui/journalwindow.hpp | 4 ++-- apps/openmw/mwgui/race.cpp | 2 +- apps/openmw/mwgui/race.hpp | 4 ++-- apps/openmw/mwgui/review.cpp | 2 +- apps/openmw/mwgui/review.hpp | 4 ++-- apps/openmw/mwgui/stats_window.cpp | 2 +- apps/openmw/mwgui/stats_window.hpp | 4 ++-- .../openmw_resources/openmw_chargen_review_layout.xml | 2 +- extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml | 2 +- extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml | 4 ++-- .../openmw_resources/openmw_stats_window_layout.xml | 2 +- extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/openmw/mwgui/journalwindow.hpp b/apps/openmw/mwgui/journalwindow.hpp index e664487634..4656c7a482 100644 --- a/apps/openmw/mwgui/journalwindow.hpp +++ b/apps/openmw/mwgui/journalwindow.hpp @@ -41,7 +41,7 @@ namespace MWGui static const int lineHeight; MyGUI::WidgetPtr skillAreaWidget, skillClientWidget; - MyGUI::VScrollPtr skillScrollerWidget; + MyGUI::ScrollBar* skillScrollerWidget; int lastPos, clientHeight; MyGUI::EditPtr mLeftTextWidget; MyGUI::EditPtr mRightTextWidget; @@ -54,4 +54,4 @@ namespace MWGui } -#endif \ No newline at end of file +#endif diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index 661319929a..e2f6072828 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/apps/openmw/mwgui/race.cpp @@ -157,7 +157,7 @@ void RaceDialog::onBackClicked(MyGUI::Widget* _sender) eventBack(); } -void RaceDialog::onHeadRotate(MyGUI::VScroll*, size_t _position) +void RaceDialog::onHeadRotate(MyGUI::ScrollBar*, size_t _position) { // TODO: Rotate head } diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp index 75b93b0670..0af173c3c6 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/apps/openmw/mwgui/race.hpp @@ -54,7 +54,7 @@ namespace MWGui EventHandle_Void eventBack; protected: - void onHeadRotate(MyGUI::VScroll* _sender, size_t _position); + void onHeadRotate(MyGUI::ScrollBar* _sender, size_t _position); void onSelectPreviousGender(MyGUI::Widget* _sender); void onSelectNextGender(MyGUI::Widget* _sender); @@ -77,7 +77,7 @@ namespace MWGui MyGUI::CanvasPtr appearanceBox; MyGUI::ListPtr raceList; - MyGUI::HScrollPtr headRotate; + MyGUI::ScrollBar* headRotate; MyGUI::WidgetPtr skillList; std::vector skillItems; diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp index 140f9537d8..cb0d9969c6 100644 --- a/apps/openmw/mwgui/review.cpp +++ b/apps/openmw/mwgui/review.cpp @@ -102,7 +102,7 @@ void ReviewDialog::open() setVisible(true); } -void ReviewDialog::onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos) +void ReviewDialog::onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos) { int diff = lastPos - pos; // Adjust position of all widget according to difference diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp index 464fe38602..588c1b6b5d 100644 --- a/apps/openmw/mwgui/review.hpp +++ b/apps/openmw/mwgui/review.hpp @@ -84,14 +84,14 @@ namespace MWGui void updateScroller(); void updateSkillArea(); - void onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos); + void onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos); void onWindowResize(MyGUI::Window* window); static const int lineHeight; MyGUI::TextBox *nameWidget, *raceWidget, *classWidget, *birthSignWidget; MyGUI::WidgetPtr skillAreaWidget, skillClientWidget; - MyGUI::VScrollPtr skillScrollerWidget; + MyGUI::ScrollBar* skillScrollerWidget; int lastPos, clientHeight; Widgets::MWDynamicStatPtr health, magicka, fatigue; diff --git a/apps/openmw/mwgui/stats_window.cpp b/apps/openmw/mwgui/stats_window.cpp index f8608ae922..243b6272a5 100644 --- a/apps/openmw/mwgui/stats_window.cpp +++ b/apps/openmw/mwgui/stats_window.cpp @@ -61,7 +61,7 @@ StatsWindow::StatsWindow (WindowManager& parWindowManager) t->eventWindowChangeCoord += MyGUI::newDelegate(this, &StatsWindow::onWindowResize); } -void StatsWindow::onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos) +void StatsWindow::onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos) { int diff = lastPos - pos; // Adjust position of all widget according to difference diff --git a/apps/openmw/mwgui/stats_window.hpp b/apps/openmw/mwgui/stats_window.hpp index 2c327f59c2..2ff170f571 100644 --- a/apps/openmw/mwgui/stats_window.hpp +++ b/apps/openmw/mwgui/stats_window.hpp @@ -57,13 +57,13 @@ namespace MWGui void addItem(const std::string text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2); void updateScroller(); - void onScrollChangePosition(MyGUI::VScrollPtr scroller, size_t pos); + void onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos); void onWindowResize(MyGUI::Window* window); static const int lineHeight; MyGUI::WidgetPtr skillAreaWidget, skillClientWidget; - MyGUI::VScrollPtr skillScrollerWidget; + MyGUI::ScrollBar* skillScrollerWidget; int lastPos, clientHeight; SkillList majorSkills, minorSkills, miscSkills; diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml index 921a7c7902..c713eb4772 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml @@ -37,7 +37,7 @@ - + diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml index 4c4cc19c11..5fa2c363ec 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml @@ -24,6 +24,6 @@ - + diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml index 7cc405c50d..eae6d48abc 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml @@ -195,7 +195,7 @@ - + @@ -216,7 +216,7 @@ - + diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml index 0f5520738b..1380d474cd 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml @@ -55,7 +55,7 @@ - + diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml b/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml index 26362de6b7..74481c805d 100644 --- a/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml +++ b/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - +