summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp2
-rw-r--r--src/gui/widgets/tabstrip.h4
-rw-r--r--src/gui/windows/charcreatedialog.cpp3
-rw-r--r--src/gui/windows/equipmentwindow.cpp2
-rw-r--r--src/gui/windows/inventorywindow.cpp2
-rw-r--r--src/gui/windows/shopwindow.cpp2
6 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index dc1e531f8..ec03b0591 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -69,7 +69,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
mDefaultButton(new Button(this, _("Default"), "default", this)),
// TRANSLATORS: button in input settings tab
mResetKeysButton(new Button(this, _("Reset all keys"), "resetkeys", this)),
- mTabs(new TabStrip(this, config.getIntValue("fontSize") + 10)),
+ mTabs(new TabStrip(this, config.getIntValue("fontSize") + 10, 0)),
mScrollArea(new ScrollArea(this, mKeyList,
Opaque_true, "setup_input_background.xml")),
mKeySetting(false),
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index e1e4ca486..978bb9776 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -29,11 +29,11 @@ class TabStrip final : public WidgetGroup
TabStrip(const Widget2 *const widget,
const std::string &group,
const int height,
- const int spacing = 0);
+ const int spacing);
TabStrip(const Widget2 *const widget,
const int height,
- const int spacing = 0);
+ const int spacing);
A_DELETE_COPY(TabStrip)
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 9037ac614..4f9c82fe2 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -243,7 +243,8 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
const int size = config.getIntValue("fontSize");
mGenderStrip = new TabStrip(this,
"gender_" + getWindowName(),
- size + 16);
+ size + 16,
+ 0);
mGenderStrip->setPressFirst(false);
mGenderStrip->addActionListener(this);
mGenderStrip->setActionEventId("gender_");
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 514499547..fa7bb6a63 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -98,7 +98,7 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment,
{
const int size = config.getIntValue("fontSize")
+ getOption("tabHeightAdjust", 16);
- mTabs = new TabStrip(this, "equipment", size);
+ mTabs = new TabStrip(this, "equipment", size, 0);
mTabs->addActionListener(this);
mTabs->setActionEventId("tab_");
mTabs->setSelectable(false);
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 3a62686ce..cf9e2c3c7 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -176,7 +176,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
mItems->addSelectionListener(this);
const int size = config.getIntValue("fontSize");
- mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16);
+ mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16, 0);
mFilter->addActionListener(this);
mFilter->setActionEventId("tag_");
mFilter->setSelectable(false);
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index d3b37b039..6ffd2649a 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -161,7 +161,7 @@ ShopWindow::ShopWindow() :
const int size = config.getIntValue("fontSize")
+ getOption("tabHeightAdjust", 16);
- mTabs = new TabStrip(this, "shop", size);
+ mTabs = new TabStrip(this, "shop", size, 0);
mTabs->addActionListener(this);
mTabs->setActionEventId("tab_");
// TRANSLATORS: shop window tab name