Changeset 130 for cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp

Timestamp:

08/26/10 15:38:59 (21 months ago)

Author:

Carsten

Message:

Revised custom video mode handling and initialization.

Files:

• cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp (modified) (2 diffs)

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp

@@ -23 +23 @@
 
 #include "MainCanvas.hpp"
+#include "AppCafu.hpp"
 #include "MainFrame.hpp"
 #include "Client/Client.hpp"
@@ -902 +903 @@
         case WXK_F11:
         {
-            m_Parent->ShowFullScreen(!m_Parent->IsFullScreen());
+            if (!wxGetApp().IsCustomVideoMode())
+            {
+                // Switching full-screen mode with F11 only makes sense if we didn't set a custom video mode (screen resolution).
+                // See AppCafuT::OnInit() for more details.
+                m_Parent->ShowFullScreen(!m_Parent->IsFullScreen());
+            }
             return;
         }