summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/buydialog.cpp3
-rw-r--r--src/gui/windows/confirmdialog.cpp2
-rw-r--r--src/gui/windows/didyouknowwindow.cpp6
-rw-r--r--src/gui/windows/emotewindow.cpp6
-rw-r--r--src/gui/windows/helpwindow.cpp6
-rw-r--r--src/gui/windows/inventorywindow.cpp3
-rw-r--r--src/gui/windows/maileditwindow.cpp3
-rw-r--r--src/gui/windows/mailwindow.cpp3
-rw-r--r--src/gui/windows/npcdialog.cpp20
-rw-r--r--src/gui/windows/okdialog.cpp2
-rw-r--r--src/gui/windows/questswindow.cpp11
-rw-r--r--src/gui/windows/serverdialog.cpp3
-rw-r--r--src/gui/windows/shopwindow.cpp3
-rw-r--r--src/gui/windows/shortcutwindow.cpp4
-rw-r--r--src/gui/windows/skilldialog.cpp4
-rw-r--r--src/gui/windows/socialwindow.cpp16
-rw-r--r--src/gui/windows/textselectdialog.cpp3
-rw-r--r--src/gui/windows/tradewindow.cpp4
-rw-r--r--src/gui/windows/updaterwindow.cpp6
-rw-r--r--src/gui/windows/whoisonline.cpp6
-rw-r--r--src/gui/windows/worldselectdialog.cpp3
21 files changed, 68 insertions, 49 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index f2e5cc46d..a85db2af4 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -277,7 +277,8 @@ void BuyDialog::init()
CREATEWIDGETV(mShopItemList, ShopListBox, this,
mShopItems, mShopItems, ShopListBoxType::Unknown);
mScrollArea = new ScrollArea(this, mShopItemList,
- getOptionBool("showbackground"), "buy_background.xml");
+ fromBool(getOptionBool("showbackground"), Opaque),
+ "buy_background.xml");
mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
mSlider = new Slider(this, 1.0, 1.0);
diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp
index 4a0936c0c..473c46eb0 100644
--- a/src/gui/windows/confirmdialog.cpp
+++ b/src/gui/windows/confirmdialog.cpp
@@ -45,7 +45,7 @@ ConfirmDialog::ConfirmDialog(const std::string &restrict title,
mIgnore(ignore)
{
mTextBox->setEditable(false);
- mTextBox->setOpaque(false);
+ mTextBox->setOpaque(Opaque_false);
mTextBox->setTextWrapped(msg, 260);
soundManager.playGuiSound(soundEvent);
}
diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp
index 1737010cc..db9352243 100644
--- a/src/gui/windows/didyouknowwindow.cpp
+++ b/src/gui/windows/didyouknowwindow.cpp
@@ -52,10 +52,10 @@ DidYouKnowWindow::DidYouKnowWindow() :
// TRANSLATORS: did you know window name
Window(_("Did You Know?"), Modal_false, nullptr, "didyouknow.xml"),
ActionListener(),
- mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
+ mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, Opaque_true,
"browserbox.xml")),
mScrollArea(new ScrollArea(this, mBrowserBox,
- true, "didyouknow_background.xml")),
+ Opaque_true, "didyouknow_background.xml")),
// TRANSLATORS: did you know window button
mButtonPrev(new Button(this, _("< Previous"), "prev", this)),
// TRANSLATORS: did you know window button
@@ -76,7 +76,7 @@ DidYouKnowWindow::DidYouKnowWindow() :
setupWindow->registerWindowForReset(this);
setDefaultSize(500, 400, ImagePosition::CENTER);
- mBrowserBox->setOpaque(false);
+ mBrowserBox->setOpaque(Opaque_false);
// TRANSLATORS: did you know window button
Button *const okButton = new Button(this, _("Close"), "close", this);
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index d0d215522..f50028a57 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -58,10 +58,12 @@ EmoteWindow::EmoteWindow() :
mEmotePage(new EmotePage(this)),
mColorModel(ColorModel::createDefault(this)),
mColorPage(CREATEWIDGETR(ColorPage, this, mColorModel, "colorpage.xml")),
- mScrollColorPage(new ScrollArea(this, mColorPage, false, "emotepage.xml")),
+ mScrollColorPage(new ScrollArea(this, mColorPage, Opaque_false,
+ "emotepage.xml")),
mFontModel(new NamesModel),
mFontPage(CREATEWIDGETR(ListBox, this, mFontModel, "")),
- mScrollFontPage(new ScrollArea(this, mFontPage, false, "fontpage.xml")),
+ mScrollFontPage(new ScrollArea(this, mFontPage, Opaque_false,
+ "fontpage.xml")),
mImageSet(Theme::getImageSetFromThemeXml("emotetabs.xml", "", 17, 16))
{
setShowTitle(false);
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index 63123d56b..54172e1ed 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -54,10 +54,10 @@ HelpWindow::HelpWindow() :
ActionListener(),
// TRANSLATORS: help window. button.
mDYKButton(new Button(this, _("Did you know..."), "DYK", this)),
- mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
+ mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, Opaque_true,
"browserbox.xml")),
mScrollArea(new ScrollArea(this, mBrowserBox,
- true, "help_background.xml")),
+ Opaque_true, "help_background.xml")),
mTagFileMap()
{
setMinWidth(300);
@@ -73,7 +73,7 @@ HelpWindow::HelpWindow() :
setDefaultSize(500, 400, ImagePosition::CENTER);
- mBrowserBox->setOpaque(false);
+ mBrowserBox->setOpaque(Opaque_false);
mBrowserBox->setLinkHandler(this);
if (gui)
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index d265a42b3..fe096971d 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -171,7 +171,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
mItems->addSelectionListener(this);
ScrollArea *const invenScroll = new ScrollArea(this, mItems,
- getOptionBool("showbackground"), "inventory_background.xml");
+ fromBool(getOptionBool("showbackground"), Opaque),
+ "inventory_background.xml");
invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
const int size = config.getIntValue("fontSize");
diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp
index d0e5e2f31..381c1d800 100644
--- a/src/gui/windows/maileditwindow.cpp
+++ b/src/gui/windows/maileditwindow.cpp
@@ -70,7 +70,8 @@ MailEditWindow::MailEditWindow() :
mInventory(new Inventory(InventoryType::Mail, 1)),
mItemContainer(new ItemContainer(this, mInventory)),
mItemScrollArea(new ScrollArea(this, mItemContainer,
- getOptionBool("showitemsbackground"), "mailedit_listbackground.xml"))
+ fromBool(getOptionBool("showitemsbackground"), Opaque),
+ "mailedit_listbackground.xml"))
{
setWindowName("MailEdit");
setCloseButton(true);
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index 87b732bf8..7345f8266 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -57,7 +57,8 @@ MailWindow::MailWindow() :
mListBox(CREATEWIDGETR(ExtendedListBox,
this, mMailModel, "extendedlistbox.xml")),
mListScrollArea(new ScrollArea(this, mListBox,
- getOptionBool("showlistbackground"), "mail_listbackground.xml")),
+ fromBool(getOptionBool("showlistbackground"), Opaque),
+ "mail_listbackground.xml")),
// TRANSLATORS: mail window button
mRefreshButton(new Button(this, _("Refresh"), "refresh", this)),
// TRANSLATORS: mail window button
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index ccb52f8c4..00ba8061d 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -99,19 +99,22 @@ NpcDialog::NpcDialog(const BeingId npcId) :
mNpcId(npcId),
mDefaultInt(0),
mDefaultString(),
- mTextBox(new BrowserBox(this, BrowserBox::AUTO_WRAP, true,
+ mTextBox(new BrowserBox(this, BrowserBox::AUTO_WRAP, Opaque_true,
"browserbox.xml")),
mScrollArea(new ScrollArea(this, mTextBox,
- getOptionBool("showtextbackground"), "npc_textbackground.xml")),
+ fromBool(getOptionBool("showtextbackground"), Opaque),
+ "npc_textbackground.xml")),
mText(),
mNewText(),
mItemList(CREATEWIDGETR(ExtendedListBox,
this, this, "extendedlistbox.xml")),
mListScrollArea(new ScrollArea(this, mItemList,
- getOptionBool("showlistbackground"), "npc_listbackground.xml")),
+ fromBool(getOptionBool("showlistbackground"), Opaque),
+ "npc_listbackground.xml")),
mSkinContainer(new Container(this)),
mSkinScrollArea(new ScrollArea(this, mSkinContainer,
- getOptionBool("showlistbackground"), "npc_listbackground.xml")),
+ fromBool(getOptionBool("showlistbackground"), Opaque),
+ "npc_listbackground.xml")),
mItems(),
mImages(),
mItemLinkHandler(new ItemLinkHandler),
@@ -135,7 +138,8 @@ NpcDialog::NpcDialog(const BeingId npcId) :
mItemContainer(new ItemContainer(this, mInventory,
10000, ShowEmptyRows_true)),
mItemScrollArea(new ScrollArea(this, mItemContainer,
- getOptionBool("showitemsbackground"), "npc_listbackground.xml")),
+ fromBool(getOptionBool("showitemsbackground"), Opaque),
+ "npc_listbackground.xml")),
mInputState(NPC_INPUT_NONE),
mActionState(NPC_ACTION_WAIT),
mSkinControls(),
@@ -165,7 +169,7 @@ NpcDialog::NpcDialog(const BeingId npcId) :
mPlayerBox->setHeight(100);
// Setup output text box
- mTextBox->setOpaque(false);
+ mTextBox->setOpaque(Opaque_false);
mTextBox->setMaxRow(config.getIntValue("ChatLogLength"));
mTextBox->setLinkHandler(mItemLinkHandler);
mTextBox->setProcessVars(true);
@@ -1289,9 +1293,9 @@ void NpcDialog::createSkinControls()
const NpcTextInfo *const info = *it;
BrowserBox *box = new BrowserBox(this,
BrowserBox::AUTO_WRAP,
- true,
+ Opaque_true,
"browserbox.xml");
- box->setOpaque(false);
+ box->setOpaque(Opaque_false);
box->setMaxRow(config.getIntValue("ChatLogLength"));
box->setLinkHandler(mItemLinkHandler);
box->setProcessVars(true);
diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp
index d687976ed..dfee80a99 100644
--- a/src/gui/windows/okdialog.cpp
+++ b/src/gui/windows/okdialog.cpp
@@ -46,7 +46,7 @@ OkDialog::OkDialog(const std::string &restrict title,
mTextBox(new TextBox(this))
{
mTextBox->setEditable(false);
- mTextBox->setOpaque(false);
+ mTextBox->setOpaque(Opaque_false);
mTextBox->setTextWrapped(msg, minWidth);
// TRANSLATORS: ok dialog button
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index a8c86e097..fd6678e55 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -68,11 +68,14 @@ QuestsWindow::QuestsWindow() :
mQuestsListBox(CREATEWIDGETR(ExtendedListBox,
this, mQuestsModel, "extendedlistbox.xml")),
mQuestScrollArea(new ScrollArea(this, mQuestsListBox,
- getOptionBool("showlistbackground"), "quests_list_background.xml")),
+ fromBool(getOptionBool("showlistbackground"), Opaque),
+ "quests_list_background.xml")),
mItemLinkHandler(new ItemLinkHandler),
- mText(new BrowserBox(this, BrowserBox::AUTO_WRAP, true, "browserbox.xml")),
+ mText(new BrowserBox(this, BrowserBox::AUTO_WRAP, Opaque_true,
+ "browserbox.xml")),
mTextScrollArea(new ScrollArea(this, mText,
- getOptionBool("showtextbackground"), "quests_text_background.xml")),
+ fromBool(getOptionBool("showtextbackground"), Opaque),
+ "quests_text_background.xml")),
// TRANSLATORS: quests window button
mCloseButton(new Button(this, _("Close"), "close", this)),
mCompleteIcon(Theme::getImageFromThemeXml("complete_icon.xml", "")),
@@ -104,7 +107,7 @@ QuestsWindow::QuestsWindow() :
mQuestsListBox->addActionListener(this);
mQuestScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
- mText->setOpaque(false);
+ mText->setOpaque(Opaque_false);
mText->setLinkHandler(mItemLinkHandler);
mTextScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
mQuestsListBox->setWidth(500);
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 509b04fda..68de46288 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -141,7 +141,8 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
mServersList->addMouseListener(this);
ScrollArea *const usedScroll = new ScrollArea(this, mServersList,
- getOptionBool("showbackground"), "server_background.xml");
+ fromBool(getOptionBool("showbackground"), Opaque),
+ "server_background.xml");
usedScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
mServersList->addSelectionListener(this);
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index a2793640c..6ec422505 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -113,7 +113,8 @@ ShopWindow::ShopWindow() :
this, mSellShopItems, mSellShopItems, ShopListBoxType::SellShop)),
mCurrentShopItemList(nullptr),
mScrollArea(new ScrollArea(this, mBuyShopItemList,
- getOptionBool("showbuybackground"), "shop_buy_background.xml")),
+ fromBool(getOptionBool("showbuybackground"), Opaque),
+ "shop_buy_background.xml")),
// TRANSLATORS: shop window label
mAddButton(new Button(this, _("Add"), "add", this)),
// TRANSLATORS: shop window label
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index ba3b97b46..9d4b34b6d 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -52,7 +52,7 @@ ShortcutWindow::ShortcutWindow(const std::string &restrict title,
int width, int height) :
Window("Window", Modal_false, nullptr, skinFile),
mItems(content),
- mScrollArea(new ScrollArea(this, mItems, false)),
+ mScrollArea(new ScrollArea(this, mItems, Opaque_false)),
mTabs(nullptr),
mPages(),
mButtonIndex(0)
@@ -169,7 +169,7 @@ void ShortcutWindow::addTab(const std::string &name,
{
if (!content || !mTabs)
return;
- ScrollArea *const scroll = new ScrollArea(this, content, false);
+ ScrollArea *const scroll = new ScrollArea(this, content, Opaque_false);
scroll->setPosition(SCROLL_PADDING, SCROLL_PADDING);
scroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
content->setWidget2(this);
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index b973c09be..9cf1a1132 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -341,7 +341,9 @@ void SkillDialog::loadXmlFile(const std::string &fileName,
SkillListBox *const listbox = new SkillListBox(this, model);
listbox->setActionEventId("sel");
listbox->addActionListener(this);
- ScrollArea *const scroll = new ScrollArea(this, listbox, false);
+ ScrollArea *const scroll = new ScrollArea(this,
+ listbox,
+ Opaque_false);
scroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
scroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index d98fec4f1..bfdab1a31 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -63,12 +63,12 @@ SocialWindow::SocialWindow() :
mPickupFilter(nullptr),
// TRANSLATORS: here P is title for visible players tab in social window
mPlayers(new SocialPlayersTab(this, _("P"),
- getOptionBool("showtabbackground"))),
+ fromBool(getOptionBool("showtabbackground"), Opaque))),
mNavigation(new SocialNavigationTab(this,
- getOptionBool("showtabbackground"))),
+ fromBool(getOptionBool("showtabbackground"), Opaque))),
// TRANSLATORS: here F is title for friends tab in social window
mFriends(new SocialFriendsTab(this, _("F"),
- getOptionBool("showtabbackground"))),
+ fromBool(getOptionBool("showtabbackground"), Opaque))),
// TRANSLATORS: social window button
mMenuButton(new Button(this, _("Menu"), "menu", this)),
mCountLabel(new Label(this, "1000 / 1000")),
@@ -113,7 +113,7 @@ void SocialWindow::postInit()
if (config.getBoolValue("enableAttackFilter"))
{
mAttackFilter = new SocialAttackTab(this,
- getOptionBool("showtabbackground"));
+ fromBool(getOptionBool("showtabbackground"), Opaque));
mTabs->addTab(mAttackFilter, mAttackFilter->mScroll);
}
else
@@ -124,7 +124,7 @@ void SocialWindow::postInit()
if (config.getBoolValue("enablePickupFilter"))
{
mPickupFilter = new SocialPickupTab(this,
- getOptionBool("showtabbackground"));
+ fromBool(getOptionBool("showtabbackground"), Opaque));
mTabs->addTab(mPickupFilter, mPickupFilter->mScroll);
}
else
@@ -192,13 +192,13 @@ bool SocialWindow::addTab(Guild *const guild)
if (guild->getServerGuild())
{
tab = new SocialGuildTab(this, guild,
- getOptionBool("showtabbackground"));
+ fromBool(getOptionBool("showtabbackground"), Opaque));
}
#ifdef TMWA_SUPPORT
else
{
tab = new SocialGuildTab2(this, guild,
- getOptionBool("showtabbackground"));
+ fromBool(getOptionBool("showtabbackground"), Opaque));
}
#endif // TMWA_SUPPORT
@@ -234,7 +234,7 @@ bool SocialWindow::addTab(Party *const party)
return false;
SocialPartyTab *const tab = new SocialPartyTab(this, party,
- getOptionBool("showtabbackground"));
+ fromBool(getOptionBool("showtabbackground"), Opaque));
mParties[party] = tab;
mTabs->addTab(tab, tab->mScroll);
diff --git a/src/gui/windows/textselectdialog.cpp b/src/gui/windows/textselectdialog.cpp
index ebbee9528..d533f3838 100644
--- a/src/gui/windows/textselectdialog.cpp
+++ b/src/gui/windows/textselectdialog.cpp
@@ -78,7 +78,8 @@ void TextSelectDialog::postInit()
mModel,
"listbox.xml");
mScrollArea = new ScrollArea(this, mItemList,
- getOptionBool("showbackground"), "sell_background.xml");
+ fromBool(getOptionBool("showbackground"), Opaque),
+ "sell_background.xml");
mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
mSelectButton = new Button(this,
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 6cf601b38..6a2f27b44 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -119,14 +119,14 @@ TradeWindow::TradeWindow() :
mMyItemContainer->addSelectionListener(this);
ScrollArea *const myScroll = new ScrollArea(this, mMyItemContainer,
- true, "trade_background.xml");
+ Opaque_true, "trade_background.xml");
myScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
mPartnerItemContainer->addSelectionListener(this);
ScrollArea *const partnerScroll = new ScrollArea(this,
mPartnerItemContainer,
- true, "trade_background.xml");
+ Opaque_true, "trade_background.xml");
partnerScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
// TRANSLATORS: trade window money label
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 8dd88f9c6..b2adf2be3 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -193,10 +193,10 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
mProgressBar(new ProgressBar(this, 0.0, 310, 0,
ProgressColorId::PROG_UPDATE,
"updateprogressbar.xml", "updateprogressbar_fill.xml")),
- mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
+ mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, Opaque_true,
"browserbox.xml")),
mScrollArea(new ScrollArea(this, mBrowserBox,
- true, "update_background.xml")),
+ Opaque_true, "update_background.xml")),
mDownloadStatus(UpdateDownloadStatus::UPDATE_NEWS),
mDownloadedBytes(0),
mUpdateIndex(0),
@@ -216,7 +216,7 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
setMinHeight(220);
mProgressBar->setSmoothProgress(false);
- mBrowserBox->setOpaque(false);
+ mBrowserBox->setOpaque(Opaque_false);
mBrowserBox->setLinkHandler(this);
mBrowserBox->setProcessVars(true);
mBrowserBox->setEnableKeys(true);
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index 7fb6caa1d..a676df0ea 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -98,9 +98,9 @@ WhoIsOnline::WhoIsOnline() :
mThread(nullptr),
mMemoryBuffer(nullptr),
mCurlError(new char[CURL_ERROR_SIZE]),
- mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
+ mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, Opaque_true,
"onlinebrowserbox.xml")),
- mScrollArea(new ScrollArea(this, mBrowserBox, false)),
+ mScrollArea(new ScrollArea(this, mBrowserBox, Opaque_false)),
// TRANSLATORS: who is online. button.
mUpdateButton(new Button(this, _("Update"), "update", this)),
mOnlinePlayers(),
@@ -142,7 +142,7 @@ void WhoIsOnline::postInit()
mUpdateButton->setEnabled(false);
mUpdateButton->setDimension(Rect(5, 5, w - 10, 20 + 5));
- mBrowserBox->setOpaque(false);
+ mBrowserBox->setOpaque(Opaque_false);
mScrollArea->setDimension(Rect(5, 20 + 10, w - 10, h - 10 - 30));
mScrollArea->setSize(w - 10, h - 10 - 30);
mBrowserBox->setLinkHandler(this);
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index e1aeb28b4..912be2d5f 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -55,7 +55,8 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds) :
mChooseWorld(new Button(this, _("Choose World"), "world", this))
{
ScrollArea *const worldsScroll = new ScrollArea(this, mWorldList,
- getOptionBool("showbackground"), "world_background.xml");
+ fromBool(getOptionBool("showbackground"), Opaque),
+ "world_background.xml");
worldsScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 11:32:23 +0000