lp:~mxsscott/widelands/windowed-graphics

Created by Mark Scott on 2013-01-06 and last modified on 2013-01-07
Get this branch:
bzr branch lp:~mxsscott/widelands/windowed-graphics
Only Mark Scott can upload to this branch. If you are Mark Scott please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Mark Scott
Project:
widelands
Status:
Merged

Recent revisions

6482. By Mark Scott on 2013-01-07

Changes post code-review - move SDL_ListModes() into for loop initializer.

6481. By Mark Scott on 2013-01-06

* Capture Enter/Return and Escape keys in the Options and Advanced Options windows to trigger Apply/Cancel respectively. This allows the user to cancel or apply a new screen resolution (such as a smaller one), when they have unfortunately selected one that is too large for their display.

For example, I can select 1280x800 (my screen resolution), but this causes the bottom of the window to be off the bottom of my screen.

* A little reworking of the graphics mode detection in options.cc to use pointers rather than unsigned ints of varying sizes to iterate over the modes.

* Change types from structs to classes since they aren't just data holders - they have methods. (this is a personal matter of style that may be discussed).

* struct res -> class Resolution: the capital letter makes it more obvious in options.cc that it is a type rather than a variable.

* WLApplication tracks the current bits per pixel. This allows it to reinitialize graphics engine when just the bpp changes, e.g. from 800x600x16 to 800x600x32.

6480. By Mark Scott on 2013-01-06

For acting on the decided graphics mode immediately:
  * New method WLApplication::refresh_graphics() for re-initing graphics from options.
    * Call this method from the main menu loop.
    * Call this method from Interactive_Base::Interactive_Base()
  * Remove graphics options checking from Interactive_Base and also remove get_xres() and get_yres() methods.
    * Those methods had notes saying they shouldn't be used. Since their only purpose was in the ctor, they are now removed so others don't code against them, e.g. sound.
  * Sound picks up x and y res for stereo mapping from g_gr

6479. By Mark Scott on 2013-01-06

Display the menu according to the current graphics window size, not the one in the options

6478. By Mark Scott on 2013-01-06

Sync with master r6481

6477. By Mark Scott on 2013-01-05

Update to latest trunk

6476. By SirVer on 2013-01-02

Updated catalogues.

6475. By SirVer on 2013-01-02

Merged mark scott's fix for bug 984197 and added him to the list of contributors.

6474. By Nasenbaer on 2013-01-02

Translation update, including Plattd├╝tsch ;)

6473. By Nasenbaer on 2013-01-01

Fix some memory leaks in network/internet code

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:widelands
This branch contains Public information 
Everyone can see this information.

Subscribers