diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/onlineplayer.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/textbox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 9 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 10 |
4 files changed, 10 insertions, 13 deletions
diff --git a/src/gui/onlineplayer.h b/src/gui/onlineplayer.h index cbc58be8f..bda860af3 100644 --- a/src/gui/onlineplayer.h +++ b/src/gui/onlineplayer.h @@ -37,7 +37,7 @@ class OnlinePlayer final const GenderT gender, const signed char version) : mNick(nick), - mText(""), + mText(), mStatus(status), mLevel(level), mVersion(version), diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index edf360b62..daa13a3e2 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -494,7 +494,7 @@ void TextBox::setForegroundColorAll(const Color &color1, std::string TextBox::getText() const { if (mTextRows.empty()) - return std::string(""); + return std::string(); int i; std::string text; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 726774cdf..7087d563b 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -719,12 +719,9 @@ void ChatWindow::mousePressed(MouseEvent &event) } else { - if (cTab) - { - popupMenu->showChatPopup(viewport->mMouseX, - viewport->mMouseY, - cTab); - } + popupMenu->showChatPopup(viewport->mMouseX, + viewport->mMouseY, + cTab); } } } diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 05bcda0ae..4ac19daaa 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -172,11 +172,6 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : mItems->addSelectionListener(this); - ScrollArea *const invenScroll = new ScrollArea(this, mItems, - fromBool(getOptionBool("showbackground"), Opaque), - "inventory_background.xml"); - invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); - const int size = config.getIntValue("fontSize"); mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16); mFilter->addActionListener(this); @@ -194,6 +189,11 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : return; } + ScrollArea *const invenScroll = new ScrollArea(this, mItems, + fromBool(getOptionBool("showbackground"), Opaque), + "inventory_background.xml"); + invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); + switch (mInventory->getType()) { case InventoryType::Inventory: |