GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1697242-fileview
into lp:widelands.
Commit message:
Changed break condition in FileViewPanel::layout() to fix an assertion failure
with negative sizes. Also, simplified the constructor.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1697242 in widelands: "trunk 8377 MacOSX 10.12 assertion failure on
FullscreenMenuAbout()"
https://bugs.launchpad.net/widelands/+bug/1697242
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1697242-fileview/+merge/325456
I can't reproduce the crash, but this branch will hopefully fix it.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands.
=== modified file 'src/ui_basic/fileview_panel.cc'
--- src/ui_basic/fileview_panel.cc 2017-03-02 08:06:00 +0000
+++ src/ui_basic/fileview_panel.cc 2017-06-11 08:50:03 +0000
@@ -29,13 +29,9 @@
namespace UI {
FileViewPanel::FileViewPanel(Panel* parent,
- int32_t x,
- int32_t y,
- int32_t w,
- int32_t h,
const Image* background,
TabPanel::Type border_type)
- : TabPanel(parent, x, y, w, h, background, border_type), padding_(5) {
+ : TabPanel(parent, 0, 0, 0, 0, background, border_type), padding_(5) {
layout();
}
@@ -70,7 +66,7 @@
void FileViewPanel::layout() {
assert(boxes_.size() == textviews_.size());
- if (get_inner_w() == 0 && get_inner_h() == 0) {
+ if (get_inner_w() <= 0 || get_inner_h() <= 0) {
return;
}
=== modified file 'src/ui_basic/fileview_panel.h'
--- src/ui_basic/fileview_panel.h 2017-01-25 18:55:59 +0000
+++ src/ui_basic/fileview_panel.h 2017-06-11 08:50:03 +0000
@@ -36,10 +36,6 @@
class FileViewPanel : public TabPanel {
public:
FileViewPanel(Panel* parent,
- int32_t x,
- int32_t y,
- int32_t w,
- int32_t h,
const Image* background,
TabPanel::Type border_type = TabPanel::Type::kNoBorder);
=== modified file 'src/ui_fsmenu/about.cc'
--- src/ui_fsmenu/about.cc 2017-03-02 08:06:00 +0000
+++ src/ui_fsmenu/about.cc 2017-06-11 08:50:03 +0000
@@ -29,10 +29,6 @@
title_(this, 0, 0, _("About Widelands"), UI::Align::kCenter),
close_(this, "close", 0, 0, 0, 0, g_gr->images().get("images/ui_basic/but2.png"), _("Close")),
tabs_(this,
- 0,
- 0,
- 0,
- 0,
g_gr->images().get("images/ui_basic/but1.png"),
UI::TabPanel::Type::kBorder) {
title_.set_fontsize(UI_FONT_SIZE_BIG);
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
