From b10b9bbf68702e7c2b728d4036391399ae397eaa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 21 Sep 2016 00:53:11 +0300 Subject: Set parts of most windows unselectable. --- src/gui/widgets/tabs/setuptab.cpp | 1 + src/gui/widgets/tabs/setuptabscroll.cpp | 2 ++ src/gui/windows/equipmentwindow.cpp | 2 ++ src/gui/windows/inventorywindow.cpp | 1 + src/gui/windows/setupwindow.cpp | 4 ++++ src/gui/windows/shopwindow.cpp | 2 ++ src/gui/windows/skilldialog.cpp | 3 +++ src/gui/windows/socialwindow.cpp | 3 +++ src/gui/windows/whoisonline.cpp | 1 + 9 files changed, 19 insertions(+) (limited to 'src') diff --git a/src/gui/widgets/tabs/setuptab.cpp b/src/gui/widgets/tabs/setuptab.cpp index 6ece24f46..8e8c6652d 100644 --- a/src/gui/widgets/tabs/setuptab.cpp +++ b/src/gui/widgets/tabs/setuptab.cpp @@ -32,6 +32,7 @@ SetupTab::SetupTab(const Widget2 *const widget) : { setOpaque(Opaque_false); addWidgetListener(this); + setSelectable(false); } void SetupTab::externalUpdated() diff --git a/src/gui/widgets/tabs/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp index 277009182..d16154c9c 100644 --- a/src/gui/widgets/tabs/setuptabscroll.cpp +++ b/src/gui/widgets/tabs/setuptabscroll.cpp @@ -38,6 +38,8 @@ SetupTabScroll::SetupTabScroll(const Widget2 *const widget) : { mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setSelectable(false); + mContainer->setSelectable(false); } SetupTabScroll::~SetupTabScroll() diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 5a2ce6103..a0dd8b550 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -100,6 +100,7 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment, mTabs = new TabStrip(this, "equipment", size); mTabs->addActionListener(this); mTabs->setActionEventId("tab_"); + mTabs->setSelectable(false); mYPadding = mTabs->getHeight() + getOption("tabPadding", 2); @@ -112,6 +113,7 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment, // Control that shows the Player mPlayerBox->setDimension(Rect(50, 80 + mYPadding, 74, 168)); mPlayerBox->setPlayer(being); + mPlayerBox->setSelectable(false); if (foring) setWindowName("Being equipment"); diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 4f855e442..8ab12f6a8 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -180,6 +180,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16); mFilter->addActionListener(this); mFilter->setActionEventId("tag_"); + mFilter->setSelectable(false); StringVect tags = ItemDB::getTags(); const size_t sz = tags.size(); diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 17211c1cd..bda333022 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -93,6 +93,10 @@ void SetupWindow::postInit() setMinWidth(310); setMinHeight(210); + mPanel->setSelectable(false); + mPanel->getTabContainer()->setSelectable(false); + mPanel->getWidgetContainer()->setSelectable(false); + static const char *const buttonNames[] = { // TRANSLATORS: setup button diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 6ec422505..684f51a19 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -163,6 +163,8 @@ ShopWindow::ShopWindow() : mTabs->addButton(_("Buy"), "buy", true); // TRANSLATORS: shop window tab name mTabs->addButton(_("Sell"), "sell", false); + mTabs->setSelectable(false); + mScrollArea->setSelectable(false); loadList(); diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 9cf1a1132..a6ede8245 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -104,6 +104,9 @@ SkillDialog::SkillDialog() : mUseButton->setEnabled(false); mIncreaseButton->setEnabled(false); + mTabs->setSelectable(false); + mTabs->getTabContainer()->setSelectable(false); + mTabs->getWidgetContainer()->setSelectable(false); place(0, 0, mTabs, 5, 5); place(0, 5, mPointsLabel, 4); diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index bfdab1a31..498ffc827 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -109,6 +109,9 @@ void SocialWindow::postInit() mTabs->addTab(mPlayers, mPlayers->mScroll); mTabs->addTab(mFriends, mFriends->mScroll); mTabs->addTab(mNavigation, mNavigation->mScroll); + mTabs->setSelectable(false); + mTabs->getTabContainer()->setSelectable(false); + mTabs->getWidgetContainer()->setSelectable(false); if (config.getBoolValue("enableAttackFilter")) { diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index a676df0ea..a138c3994 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -145,6 +145,7 @@ void WhoIsOnline::postInit() mBrowserBox->setOpaque(Opaque_false); mScrollArea->setDimension(Rect(5, 20 + 10, w - 10, h - 10 - 30)); mScrollArea->setSize(w - 10, h - 10 - 30); + mScrollArea->setSelectable(false); mBrowserBox->setLinkHandler(this); add(mUpdateButton); -- cgit v1.2.3-60-g2f50