Merge lp://staging/~widelands-dev/widelands/fsmenu_fullscreen_4_options into lp://staging/widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8254
Proposed branch: lp://staging/~widelands-dev/widelands/fsmenu_fullscreen_4_options
Merge into: lp://staging/widelands
Diff against target: 811 lines (+277/-160)
9 files modified
src/ui_basic/checkbox.cc (+37/-15)
src/ui_basic/checkbox.h (+4/-8)
src/ui_basic/dropdown.cc (+33/-11)
src/ui_basic/dropdown.h (+4/-0)
src/ui_basic/listselect.cc (+1/-0)
src/ui_basic/spinbox.cc (+65/-46)
src/ui_basic/spinbox.h (+6/-0)
src/ui_fsmenu/options.cc (+116/-73)
src/ui_fsmenu/options.h (+11/-7)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/fsmenu_fullscreen_4_options
Reviewer Review Type Date Requested Status
kaputtnik (community) testing Approve
Klaus Halfmann Needs Information
Review via email: mp+312966@code.staging.launchpad.net

Commit message

The Options window now relayouts itself for fullscreen switch. Includes changes to checkbox, dropdown, listselect and spinbox in order to make it happen.

To post a comment you must log in.
Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Code looks OK (as far as I can grasp it).
One nit inline.

I will however compile this and do some stress tesing on OSX with a dual Monitor layout.

Will/Hsould the 'f' (or some) shortcut be supported inside the menu?

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Clang complains:

fsmenu_fullscreen_4_options/src/ui_fsmenu/options.cc:139:25: error: field
      'column_width_' is uninitialized when used here [-Werror,-Wuninitialized]
                        column_width_ / 2,

fsmenu_fullscreen_4_options/src/ui_fsmenu/options.cc:145:27: error: field
      'column_width_' is uninitialized when used here [-Werror,-Wuninitialized]
                          column_width_ / 2,

Where should that column_width_ be set?

review: Needs Fixing
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for the clang output - I replaced it with a constant. It is set later in the layout() function. I also did my best on your nit :)

And yes, this is about the f button.

Should the overall size not be correct with multiscreen setups, that will be a separate bug.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

OK, I tryed this with a two Monitor layout on OSX.
Main Monitor Full-HD plus the "normal" Laptop Display.

Works for all Tabs using f back and forth.

Small Problem; when on the Second Scrren the normalw window
moves quite quite a bit to the right, but still is visbile.

I think we need at least a test on Wind and some Linux,
bet with mutiple Monitors, if possible.

I get this carsh now (which I had in trunk, too)
Assertion failed: (lborder_ + rborder_ <= w_), function get_inner_w, file /Users/klaus/develop/widelands-repo/fsmenu_fullscreen_4_options/src/ui_basic/panel.h, line 184.
Abort trap: 6

THis happend when I start widelands directly into the fullscreen mode and then
try to open the internet panel.

review: Needs Information
Revision history for this message
GunChleoc (gunchleoc) wrote :

Both of these problems are happening in trunk already, so this needs a bug report for trunk, not for this branch.

This bug doesn't implement the size change, it only relayouts the contents of the Options panel and adjust some bits of the toolkit to make this happen.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1751. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182848448.
Appveyor build 1591. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fsmenu_fullscreen_4_options-1591.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1751. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182848448.
Appveyor build 1591. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fsmenu_fullscreen_4_options-1591.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

HTTP Error 500: Internal Server Error

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1751. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182848448.
Appveyor build 1591. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fsmenu_fullscreen_4_options-1591.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1751. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182848448.
Appveyor build 1591. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fsmenu_fullscreen_4_options-1591.

Revision history for this message
kaputtnik (franku) wrote :

Works here on Linux with multi monitor setup.

review: Approve (testing)
Revision history for this message
GunChleoc (gunchleoc) wrote :

Hasi50 approved the code for this branch in IRC.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: