Merge pull request #3437 from vnen/fix-3149

Change default video mode for X11
This commit is contained in:
Juan Linietsky 2016-01-24 17:44:26 -03:00
commit 72d1f2ef30
4 changed files with 4 additions and 4 deletions

View File

@ -76,7 +76,7 @@ public:
bool fullscreen;
bool resizable;
float get_aspect() const { return (float)width/(float)height; }
VideoMode(int p_width=1280,int p_height=720,bool p_fullscreen=false, bool p_resizable = true) {width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; }
VideoMode(int p_width=1024,int p_height=600,bool p_fullscreen=false, bool p_resizable = true) {width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; }
};
protected:
friend class Main;

View File

@ -839,7 +839,7 @@ const char * OS_OSX::get_video_driver_name(int p_driver) const {
OS::VideoMode OS_OSX::get_default_video_mode() const {
VideoMode vm;
vm.width=800;
vm.width=1024;
vm.height=600;
vm.fullscreen=false;
vm.resizable=true;

View File

@ -149,7 +149,7 @@ const char * OS_Windows::get_video_driver_name(int p_driver) const {
OS::VideoMode OS_Windows::get_default_video_mode() const {
return VideoMode(1280,720,false);
return VideoMode(1024,600,false);
}
int OS_Windows::get_audio_driver_count() const {

View File

@ -78,7 +78,7 @@ const char * OS_X11::get_video_driver_name(int p_driver) const {
}
OS::VideoMode OS_X11::get_default_video_mode() const {
return OS::VideoMode(1280,720,false);
return OS::VideoMode(1024,600,false);
}
int OS_X11::get_audio_driver_count() const {