diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-30 07:28:09 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-30 07:28:09 +0200 |
| commit | 77da64ca96c3292c1ce5b7d8845305a98da4224c (patch) | |
| tree | 3a794d5cfea5170e662f1269193fea248e165966 | |
| parent | cf3575e0b4c5e73c6f8889bcf662906383021171 (diff) | |
| parent | d02a819fd0637bf87f10390e14f54e8341474869 (diff) | |
Merge pull request #4891 from Hinsbart/dpi_demo
Update window management demo to show screen dpi
| -rw-r--r-- | demos/misc/window_management/control.gd | 4 | ||||
| -rw-r--r-- | demos/misc/window_management/window_management.scn | bin | 4384 -> 3588 bytes |
2 files changed, 4 insertions, 0 deletions
diff --git a/demos/misc/window_management/control.gd b/demos/misc/window_management/control.gd index cd8e0e185b..c856555122 100644 --- a/demos/misc/window_management/control.gd +++ b/demos/misc/window_management/control.gd @@ -43,6 +43,8 @@ func _fixed_process(delta): get_node("Label_Screen0_Resolution").set_text(str("Screen0 Resolution:\n", OS.get_screen_size())) get_node("Label_Screen0_Position").set_text(str("Screen0 Position:\n", OS.get_screen_position())) + + get_node("Label_Screen0_DPI").set_text(str("Screen0 DPI:\n", OS.get_screen_dpi())) if(OS.get_screen_count() > 1): get_node("Button_Screen0").show() @@ -51,11 +53,13 @@ func _fixed_process(delta): get_node("Label_Screen1_Position").show() get_node("Label_Screen1_Resolution").set_text(str("Screen1 Resolution:\n", OS.get_screen_size(1))) get_node("Label_Screen1_Position").set_text(str("Screen1 Position:\n", OS.get_screen_position(1))) + get_node("Label_Screen1_DPI").set_text(str("Screen1 DPI:\n", OS.get_screen_dpi(1))) else: get_node("Button_Screen0").hide() get_node("Button_Screen1").hide() get_node("Label_Screen1_Resolution").hide() get_node("Label_Screen1_Position").hide() + get_node("Label_Screen1_DPI").hide() get_node("Button_Fullscreen").set_pressed(OS.is_window_fullscreen()) get_node("Button_FixedSize").set_pressed(!OS.is_window_resizable()) diff --git a/demos/misc/window_management/window_management.scn b/demos/misc/window_management/window_management.scn Binary files differindex 35662871f1..91174669cd 100644 --- a/demos/misc/window_management/window_management.scn +++ b/demos/misc/window_management/window_management.scn |