From 40fff906d1ad90f5c2a95bb75cdf6ef561ecaf27 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 30 Mar 2015 17:57:37 +0200
Subject: [PATCH] Change default window size to 800x600 across the board (incl
 runtime)

---
 direct/src/p3d/pdeploy.py                    | 2 +-
 direct/src/plugin_standalone/panda3d.cxx     | 4 ++--
 direct/src/plugin_standalone/panda3dBase.cxx | 4 ++--
 panda/src/display/config_display.cxx         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/direct/src/p3d/pdeploy.py b/direct/src/p3d/pdeploy.py
index 9ba14e43be..0b0a77f834 100644
--- a/direct/src/p3d/pdeploy.py
+++ b/direct/src/p3d/pdeploy.py
@@ -319,7 +319,7 @@ elif deploy_mode == 'installer':
     del i
 
 elif deploy_mode == 'html':
-    w, h = tokens.get("width", 640), tokens.get("height", 480)
+    w, h = tokens.get("width", 800), tokens.get("height", 600)
     if "data" not in tokens:
         tokens["data"] = appFilename.getBasename()
 
diff --git a/direct/src/plugin_standalone/panda3d.cxx b/direct/src/plugin_standalone/panda3d.cxx
index 78bb7143e0..ab0219f7cf 100644
--- a/direct/src/plugin_standalone/panda3d.cxx
+++ b/direct/src/plugin_standalone/panda3d.cxx
@@ -226,8 +226,8 @@ run_command_line(int argc, char *argv[]) {
       // The user asked for an embedded window.  Create a toplevel
       // window to be its parent, of the requested size.
       if (_win_width == 0 && _win_height == 0) {
-        _win_width = 640;
-        _win_height = 480;
+        _win_width = 800;
+        _win_height = 600;
       }
       
       make_parent_window();
diff --git a/direct/src/plugin_standalone/panda3dBase.cxx b/direct/src/plugin_standalone/panda3dBase.cxx
index be2d278889..6b38e221f2 100644
--- a/direct/src/plugin_standalone/panda3dBase.cxx
+++ b/direct/src/plugin_standalone/panda3dBase.cxx
@@ -62,8 +62,8 @@ Panda3DBase(bool console_environment) {
 
   _win_x = -1;
   _win_y = -1;
-  _win_width = 640;
-  _win_height = 480;
+  _win_width = 800;
+  _win_height = 600;
   _got_win_size = false;
 
   _exit_with_last_instance = true;
diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx
index 978d88f256..0d219273e5 100644
--- a/panda/src/display/config_display.cxx
+++ b/panda/src/display/config_display.cxx
@@ -301,7 +301,7 @@ ConfigVariableBool allow_incomplete_render
           "the frame render if necessary."));
 
 ConfigVariableInt win_size
-("win-size", "640 480",
+("win-size", "800 600",
  PRC_DESC("This is the default size at which to open a new window.  This "
           "replaces the deprecated win-width and win-height variables."));