diff options
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_colors.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/window.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 0092221c7..0e1bfda59 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -864,7 +864,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) if (index == mSelectedIndex || mSelectedIndex == -1) return; if (inventoryWindow != nullptr) - inventoryWindow->combineItems(index, mSelectedIndex); + inventoryWindow->combineItems(mSelectedIndex, index); return; } else if (src == DragDropSource::Cart && diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index 5129b1f88..dcf286bcf 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -217,8 +217,8 @@ void Setup_Colors::action(const ActionEvent &event) const std::string &eventId = event.getId(); if (eventId == "slider_grad") { - updateGradType(); updateColor(); + updateGradType(); return; } diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 3b4843cac..5eb4df526 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -441,8 +441,8 @@ class Window notfinal : public BasicContainer2, LayoutCell &place(const int x, const int y, Widget *const wg, - const int w, - const int h); + const int w = 1, + const int h = 1); /** * Returns a proxy for adding widgets in an inner table of the layout. |