[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands has been updated. Commit Message changed to: Fixed panel sizes < 0 in FileViewPanel::layout(). Also, simplified the TabPanel constructor. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1697242-fileview/+merge/325456 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1697242-fileview. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands has been updated. Commit Message changed to: Fixed panel sizes < 0 in FileViewPanel::layout(). Also, simplified the constructor. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1697242-fileview/+merge/325456 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1697242-fileview. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands
Review: Resubmit The original Bug reporter has tested & confirmed that the fix is working now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1697242-fileview/+merge/325456 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1697242-fileview. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands
Code is OK, but I got this assertion: Assertion failed: (nh >= 0), function set_size, file .../bug-1697242-fileview/src/ui_basic/panel.cc, line 242. Abort trap: 6 but was unable to reproduce this :\ I think it was opening the about window after switching to fullscreen? ON OSX we have the extar quirks with the Retina displays and theire special "resolutions". Obne using a Debugger it did not happen again. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1697242-fileview/+merge/325456 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/boost-system-dependency into lp:widelands
It isn't shown by the diff below, but `.travis.sh` installs `libboost-all-dev`, which is a metapackage to install all boost components. This is likely the reason why this wasn't discovered until merged to trunk, since the Debian packaging is more minimal and only list the required components. Should we change this, so that travis also only installs the specific components we use? (I think Debian/Ubuntu are one of the few distros to split up boost like this, so most other platforms where people do self-compile shouldn't see similar issues) -- https://code.launchpad.net/~hjd/widelands/boost-system-dependency/+merge/325448 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/boost-system-dependency into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands
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 +
+++ src/ui_basic/fileview_panel.cc 2017-06-11 08:50:03 +
@@ -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 +
+++ src/ui_basic/fileview_panel.h 2017-06-11 08:50:03 +
@@ -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 +
+++ src/ui_fsmenu/about.cc 2017-06-11 08:50:03 +
@@ -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
