Changeset 328 for trunk/tests/gui_test

Timestamp:

09/02/14 03:38:18 (11 years ago)

Author:

epyon

Message:

• support for basic gui element skinning (WIP)
• window_manager fix for gui_test

Location:

trunk/tests/gui_test

Files:

• gui_test.lua (modified) (1 diff)
• nv_gui_test.cc (modified) (3 diffs)
• test.style.lua (modified) (1 diff)

trunk/tests/gui_test/gui_test.lua

@@ -4 +4 @@
         includedirs { "../../" }
         targetname "nv_gui_test"
-        links { "nv-core", "nv-gl", "nv-gui" }
+        links { "nv-core", "nv-gl", "nv-gui", "nv-sdl" }
         targetdir "../../bin"   
  

trunk/tests/gui_test/nv_gui_test.cc

@@ -1 +1 @@
 #include <nv/gl/gl_device.hh>
 #include <nv/gui/gui_environment.hh>
+#include <nv/sdl/sdl_window_manager.hh>
 #include <nv/interface/context.hh>
+#include <nv/interface/window_manager.hh>
 #include <nv/core/logging.hh>
 #include <nv/core/logger.hh>
@@ -18 +20 @@
         ~application();
 protected:
+        nv::window_manager* m_wm;
         nv::device* m_device;
         nv::window* m_window;
@@ -28 +31 @@
 {
         m_device = new nv::gl_device();
-        m_window = m_device->create_window( 800, 600, false );
+        m_wm     = new nv::sdl::window_manager;
+        m_window = m_wm->create_window( m_device, 800, 600, false );
         m_clear_state.buffers = nv::clear_state::COLOR_AND_DEPTH_BUFFER;
         m_guienv = new nv::gui::environment( m_window );

trunk/tests/gui_test/test.style.lua

@@ -6 +6 @@
 
         window = {
-                border = 2,
-                border_color = { 0.2, 0.2, 0.4, 1.0 },
+                --border = 2,
+                --border_color = { 0.2, 0.2, 0.4, 1.0 },
+                skin = "button.png",
         }
 }