From a2f54815d3310c3b5dab0f06b1b06510c8aa0620 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 Sep 2016 19:10:44 +0300 Subject: Set unselectable most parts of status window. --- src/gui/widgets/attrs/attrdisplay.cpp | 1 + src/gui/widgets/statspage.cpp | 3 +++ src/gui/widgets/statspagebasic.cpp | 3 +++ src/gui/windows/statuswindow.cpp | 8 ++++++++ 4 files changed, 15 insertions(+) diff --git a/src/gui/widgets/attrs/attrdisplay.cpp b/src/gui/widgets/attrs/attrdisplay.cpp index 8efadfcf0..2eaa0c7c4 100644 --- a/src/gui/widgets/attrs/attrdisplay.cpp +++ b/src/gui/widgets/attrs/attrdisplay.cpp @@ -45,6 +45,7 @@ AttrDisplay::AttrDisplay(const Widget2 *const widget, { setSize(100, 32); + setSelectable(false); mLabel->setAlignment(Graphics::CENTER); mValue->setAlignment(Graphics::CENTER); } diff --git a/src/gui/widgets/statspage.cpp b/src/gui/widgets/statspage.cpp index 556240d17..56a4df855 100644 --- a/src/gui/widgets/statspage.cpp +++ b/src/gui/widgets/statspage.cpp @@ -40,9 +40,12 @@ StatsPage::StatsPage(const Widget2 *const widget, mAttrScroll(new ScrollArea(this, mAttrCont, Opaque_false)) { addWidgetListener(this); + setSelectable(false); mAttrScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); mAttrScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO); + mAttrScroll->setSelectable(false); + mAttrCont->setSelectable(false); add(mAttrScroll); const std::vector &basicStats = StatDb::getStats(page); diff --git a/src/gui/widgets/statspagebasic.cpp b/src/gui/widgets/statspagebasic.cpp index 7885f6d90..96db773e3 100644 --- a/src/gui/widgets/statspagebasic.cpp +++ b/src/gui/widgets/statspagebasic.cpp @@ -45,9 +45,12 @@ StatsPageBasic::StatsPageBasic(const Widget2 *const widget) : mCharacterPointsLabel(new Label(this, "C")) { addWidgetListener(this); + setSelectable(false); mAttrScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); mAttrScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO); + mAttrScroll->setSelectable(false); + mAttrCont->setSelectable(false); add(mAttrScroll); const std::vector &basicStats = StatDb::getBasicStats(); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 16e00fed7..00e061400 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -97,6 +97,10 @@ StatusWindow::StatusWindow() : setDefaultSize((windowContainer->getWidth() - 480) / 2, (windowContainer->getHeight() - 500) / 2, 480, 500); + mTabs->setSelectable(false); + mTabs->getWidgetContainer()->setSelectable(false); + mTabs->getTabContainer()->setSelectable(false); + if (localPlayer && !localPlayer->getRaceName().empty()) { setCaption(strprintf("%s (%s)", localPlayer->getName().c_str(), @@ -116,6 +120,7 @@ StatusWindow::StatusWindow() : "hpprogressbar.xml", "hpprogressbar_fill.xml"); mHpBar->setColor(getThemeColor(ThemeColorId::HP_BAR), getThemeColor(ThemeColorId::HP_BAR_OUTLINE)); + mHpBar->setSelectable(false); max = PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED); mXpBar = new ProgressBar(this, @@ -128,6 +133,7 @@ StatusWindow::StatusWindow() : "xpprogressbar.xml", "xpprogressbar_fill.xml"); mXpBar->setColor(getThemeColor(ThemeColorId::XP_BAR), getThemeColor(ThemeColorId::XP_BAR_OUTLINE)); + mXpBar->setSelectable(false); const bool job = serverConfig.getValueBool("showJob", true); @@ -144,6 +150,7 @@ StatusWindow::StatusWindow() : useMagic ? ProgressColorId::PROG_MP : ProgressColorId::PROG_NO_MP, useMagic ? "mpprogressbar.xml" : "nompprogressbar.xml", useMagic ? "mpprogressbar_fill.xml" : "nompprogressbar_fill.xml"); + mMpBar->setSelectable(false); if (useMagic) { mMpBar->setColor(getThemeColor(ThemeColorId::MP_BAR), @@ -177,6 +184,7 @@ StatusWindow::StatusWindow() : "jobprogressbar.xml", "jobprogressbar_fill.xml"); mJobBar->setColor(getThemeColor(ThemeColorId::JOB_BAR), getThemeColor(ThemeColorId::JOB_BAR_OUTLINE)); + mJobBar->setSelectable(false); place(3, 0, mJobLvlLabel, 3); place(5, 2, mJobLabel).setPadding(3); -- cgit v1.2.3-60-g2f50