From 001a16064f886944f2746828c3b8d8be813838e5 Mon Sep 17 00:00:00 2001 From: hurikhan Date: Mon, 23 Mar 2015 00:09:12 -0400 Subject: [PATCH] adjust the window_management demo to the new function names --- demos/misc/window_management/control.gd | 54 +++++++++--------- .../window_management/window_management.scn | Bin 5087 -> 5129 bytes 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/demos/misc/window_management/control.gd b/demos/misc/window_management/control.gd index d1b8f0e71a3..5eb58176196 100644 --- a/demos/misc/window_management/control.gd +++ b/demos/misc/window_management/control.gd @@ -5,18 +5,18 @@ func _fixed_process(delta): var modetext = "Mode:\n" - if(OS.is_fullscreen()): + if(OS.is_window_fullscreen()): modetext += "Fullscreen\n" else: modetext += "Windowed\n" - if(!OS.is_resizable()): + if(!OS.is_window_resizable()): modetext += "FixedSize\n" - if(OS.is_minimized()): + if(OS.is_window_minimized()): modetext += "Minimized\n" - if(OS.is_maximized()): + if(OS.is_window_maximized()): modetext += "Maximized\n" if(Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED): @@ -55,9 +55,9 @@ func _fixed_process(delta): get_node("Label_Screen1_Position").hide() get_node("Button_Fullscreen").set_pressed( OS.is_window_fullscreen() ) - get_node("Button_FixedSize").set_pressed( !OS.is_is_window_resizable() ) - get_node("Button_Minimized").set_pressed( OS.is_is_window_minimized() ) - get_node("Button_Maximized").set_pressed( OS.is_is_window_maximized() ) + get_node("Button_FixedSize").set_pressed( !OS.is_window_resizable() ) + get_node("Button_Minimized").set_pressed( OS.is_window_minimized() ) + get_node("Button_Maximized").set_pressed( OS.is_window_maximized() ) get_node("Button_Mouse_Grab").set_pressed( Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED ) @@ -66,11 +66,11 @@ func check_wm_api(): if( !OS.has_method("get_screen_count") ): s += " - get_screen_count()\n" - if( !OS.has_method("get_screen") ): - s += " - get_screen()\n" + if( !OS.has_method("get_current_screen") ): + s += " - get_current_screen()\n" - if( !OS.has_method("set_screen") ): - s += " - set_screen()\n" + if( !OS.has_method("set_current_screen") ): + s += " - set_current_screen()\n" if( !OS.has_method("get_screen_position") ): s += " - get_screen_position()\n" @@ -90,29 +90,29 @@ func check_wm_api(): if( !OS.has_method("set_window_size") ): s += " - set_window_size()\n" - if( !OS.has_method("set_fullscreen") ): - s += " - set_fullscreen()\n" + if( !OS.has_method("set_window_fullscreen") ): + s += " - set_window_fullscreen()\n" - if( !OS.has_method("is_fullscreen") ): - s += " - is_fullscreen()\n" + if( !OS.has_method("is_window_fullscreen") ): + s += " - is_window_fullscreen()\n" - if( !OS.has_method("set_resizable") ): - s += " - set_resizable()\n" + if( !OS.has_method("set_window_resizable") ): + s += " - set_window_resizable()\n" - if( !OS.has_method("is_resizable") ): - s += " - is_resizable()\n" + if( !OS.has_method("is_window_resizable") ): + s += " - is_window_resizable()\n" - if( !OS.has_method("set_minimized") ): - s += " - set_minimized()\n" + if( !OS.has_method("set_window_minimized") ): + s += " - set_window_minimized()\n" - if( !OS.has_method("is_minimized") ): - s += " - is_minimized()\n" + if( !OS.has_method("is_window_minimized") ): + s += " - is_window_minimized()\n" - if( !OS.has_method("set_maximized") ): - s += " - set_maximized()\n" + if( !OS.has_method("set_window_maximized") ): + s += " - set_window_maximized()\n" - if( !OS.has_method("is_maximized") ): - s += " - is_maximized()\n" + if( !OS.has_method("is_window_maximized") ): + s += " - is_window_maximized()\n" if( s.length() == 0 ): return true diff --git a/demos/misc/window_management/window_management.scn b/demos/misc/window_management/window_management.scn index b8b0ee210bd9249622682ba85d0ae7915e63b24f..c7d6260df620d50d0960fb0dcf6e8df43db9eadc 100644 GIT binary patch delta 3151 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 delta 3121 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