Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands
Thanks for the review :) -- 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. Status: Needs review => Merged 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: Approve lgtm. This seems like a net simplification to me, which is always great :) @bunnybot merge -- 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: Approve testing Works :-) Opened all windows and found no problems. Should Ken Cunnningham be asked if the initial bug is still fixed for him? Looks like this is complicated stuff... maybe add some comments to the code? -- 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 *headdesk* next try. -- 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
Ah, a debug build shows assertions: Clicking on tab in About: widelands: ../src/ui_basic/tabpanel.cc:313: virtual void UI::TabPanel::draw(RenderTarget&): Assertion `x <= get_w()' failed. Opening Options: widelands: ../src/ui_basic/panel.cc:242: void UI::Panel::set_size(int, int): Assertion `nh >= 0' failed. -- 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: Needs Fixing The About page works not correct. When clicking one of the tabs, nothing is shown anymore and the tab bar is cut. Happens also if you click on "Readme". Options window: - The 'background panel(?) (the one where ui elements are placed on), is restricted to the height to fit all ui elements when widelands is started in widow mode. This has side effects for the dropdown menus (they appear to small in height so only one entry is shown) Switching to fullscreen and back the height of the background panel is as usual. But the dropdown menus then begins to far down from the initial point. Didn't inspect further. -- 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 Thanks! Should be fixed 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
[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 assert failure with sizes in FileViewPanel::layout() and TabPanel. 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands
Review: Needs Fixing I got a crash when trying to open the buildings statistics menu: widelands: /home/kaputtnik/widelands-repo/bug-1697242-fileview/src/ui_basic/tabpanel.cc:313: virtual void UI::TabPanel::draw(RenderTarget&): Assertion `x <= get_w()' failed. Played in fullscreen with initial resolution 800x600. Tested this three times and on the second try the crash happens only after opening the buildings statistics menu the second time (press B (open), press B (close), press B -> crash). The first and third try the crash happens after the first try to open the buildings statistics menu. To be sure i opened also a new game with this branch, and after hitting 'B' several times the crash happens. -- 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
Continuous integration builds have changed state: Travis build 2310. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/243586383. Appveyor build 2143. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1697242_fileview-2143. -- 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
Continuous integration builds have changed state: Travis build 2285. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/242178054. Appveyor build 2120. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1697242_fileview-2120. -- 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
[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
