Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/align-align into lp:widelands

2017-02-21 Thread Klaus Halfmann
FullscreenWindow will need Tiling { kNone, kHorizontal, kVertical } and FullscreenWindow actually needs the all the Align enums. I will try what I can make of it. -- https://code.launchpad.net/~widelands-dev/widelands/align-align/+merge/317871 Your team Widelands Developers is requested to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands

2017-02-21 Thread Notabilis
Currently, create() is only called by the ship windows and by popup messages (e.g. the current status with the collectors win condition but not messages like "no rocks"). When the notifications_buildingwindows branch is merged, buildings will use it, too. I just tried (and pushed) a

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/align-align into lp:widelands

2017-02-21 Thread GunChleoc
I have looked at the codebase now - the only places where we use the horizontal/vertical distinction is in wordwrap and in FullscreenWindow::blit_image. We do not need vertical alignment at all. The one in Wordwrap can go - we only use horizontal alignment there. FullscreenWindow::blit_image

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/hasimusic into lp:widelands

2017-02-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 1971. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/203921992. Appveyor build 1806. State: success. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands

2017-02-21 Thread Notabilis
Review: Approve diff only I am a bit scared to say something here again, but: The diff looks good to me. ;-) I have neither tested nor compiled the changes, though. But grep couldn't find any of the to-be-removed strings in trunk or the metaserver source. So, uh... I guess it can be merged?

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands

2017-02-21 Thread GunChleoc
Or have a look at where create is used - maybe we do want to focus and maximize at all times anyway. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1663490-ship-windows/+merge/317051 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands

2017-02-21 Thread GunChleoc
How about adding a new action "Selected" to the ship notifications? This could then focus and maximize the window. create() is only used when the window has been closed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1663490-ship-windows/+merge/317051 Your team Widelands Developers

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands

2017-02-21 Thread Notabilis
Review: Resubmit Okay, good news first: I am using the UniqueWindow now and the code looks much better. Thanks for the hint. Bad news: In my previous commit, clicking on a ship with the window in the background or minimized focused and showed the window. This is no longer the case with the

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/align-align into lp:widelands

2017-02-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 1970. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/203874154. Appveyor build 1805. State: failed. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/align-align into lp:widelands

2017-02-21 Thread Klaus Halfmann
Hello Gun, thnaks for the first review, I was not sure where to use one dimension HAlign and where two Align, I will follow your suggestions and change the sigantures of the funktions involved. About the Bitmask: I will extract an anonymous enum and put them there, as they are needed for

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/align-align into lp:widelands

2017-02-21 Thread GunChleoc
First impression: 1. Why does HAlign have a Bitmask for horizontal, and VALign a bitmask for Vertical? They are by definition horizontal/vertical. We should get rid of these bitmasks. 2. I made Align an enum class on purpose for type safety - at some parts in the code, people had hacked

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/hasimusic into lp:widelands

2017-02-21 Thread Klaus Halfmann
Klaus Halfmann has proposed merging lp:~widelands-dev/widelands/hasimusic into lp:widelands. Requested reviews: toptopple (7010622-q) Related bugs: Bug #1549963 in widelands: "Proposal for a new Game music" https://bugs.launchpad.net/widelands/+bug/1549963 Bug #1556620 in widelands: