From f0f90ce9b17785faf030258687ffe6fe21e0271c Mon Sep 17 00:00:00 2001 From: Insality Date: Sun, 26 Oct 2025 22:35:03 +0200 Subject: [PATCH] Update property panels layers --- druid/helper.lua | 3 ++- .../properties/property_button.gui | 11 +++++++++ .../properties/property_checkbox.gui | 11 +++++++++ .../properties/property_input.gui | 9 ++++++++ .../property_left_right_selector.gui | 14 +++++++++++ .../properties/property_slider.gui | 14 +++++++++++ .../properties/property_text.gui | 9 ++++++++ .../properties/property_vector3.gui | 23 ++++++++++++++++--- .../properties_panel/properties_panel.gui | 16 ++++++++++++- 9 files changed, 105 insertions(+), 5 deletions(-) diff --git a/druid/helper.lua b/druid/helper.lua index 021a2b2..bb43d0c 100644 --- a/druid/helper.lua +++ b/druid/helper.lua @@ -366,7 +366,8 @@ end ---Check if device is desktop ---@return boolean function M.is_desktop() - return const.CURRENT_SYSTEM_NAME == const.OS.WINDOWS or const.CURRENT_SYSTEM_NAME == const.OS.MAC or const.CURRENT_SYSTEM_NAME == const.OS.LINUX + local name = const.CURRENT_SYSTEM_NAME + return name == const.OS.WINDOWS or name == const.OS.MAC or name == const.OS.LINUX end diff --git a/druid/widget/properties_panel/properties/property_button.gui b/druid/widget/properties_panel/properties/property_button.gui index a7e55c8..e2c9973 100644 --- a/druid/widget/properties_panel/properties/property_button.gui +++ b/druid/widget/properties_panel/properties/property_button.gui @@ -15,6 +15,7 @@ nodes { texture: "druid/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH + layer: "druid" inherit_alpha: true visible: false } @@ -52,6 +53,7 @@ nodes { } adjust_mode: ADJUST_MODE_STRETCH parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -89,6 +91,7 @@ nodes { texture: "druid/rect_round2_width2" id: "button" parent: "E_Anchor" + layer: "druid" inherit_alpha: true slice9 { x: 5.0 @@ -116,6 +119,7 @@ nodes { pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH parent: "button" + layer: "druid" inherit_alpha: true } nodes { @@ -147,9 +151,16 @@ nodes { z: 1.0 } parent: "button" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 } +layers { + name: "druid" +} +layers { + name: "druid_text_bold" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/druid/widget/properties_panel/properties/property_checkbox.gui b/druid/widget/properties_panel/properties/property_checkbox.gui index 1edfc64..9cf5768 100644 --- a/druid/widget/properties_panel/properties/property_checkbox.gui +++ b/druid/widget/properties_panel/properties/property_checkbox.gui @@ -15,6 +15,7 @@ nodes { texture: "druid/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH + layer: "druid" inherit_alpha: true visible: false } @@ -51,6 +52,7 @@ nodes { z: 1.0 } parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -88,6 +90,7 @@ nodes { texture: "druid/rect_round2_width2" id: "button" parent: "E_Anchor" + layer: "druid" inherit_alpha: true slice9 { x: 5.0 @@ -106,6 +109,7 @@ nodes { texture: "druid/ui_circle_16" id: "icon" parent: "button" + layer: "druid" inherit_alpha: true size_mode: SIZE_MODE_AUTO } @@ -128,7 +132,14 @@ nodes { pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH parent: "button" + layer: "druid" inherit_alpha: true } +layers { + name: "druid" +} +layers { + name: "druid_text_bold" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/druid/widget/properties_panel/properties/property_input.gui b/druid/widget/properties_panel/properties/property_input.gui index c204d30..bb599c9 100644 --- a/druid/widget/properties_panel/properties/property_input.gui +++ b/druid/widget/properties_panel/properties/property_input.gui @@ -15,6 +15,7 @@ nodes { texture: "druid/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH + layer: "druid" inherit_alpha: true visible: false } @@ -51,6 +52,7 @@ nodes { z: 1.0 } parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -137,7 +139,14 @@ nodes { pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH parent: "E_Anchor" + layer: "druid" inherit_alpha: true } +layers { + name: "druid" +} +layers { + name: "druid_text_bold" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/druid/widget/properties_panel/properties/property_left_right_selector.gui b/druid/widget/properties_panel/properties/property_left_right_selector.gui index 69f8b73..19c6a3d 100644 --- a/druid/widget/properties_panel/properties/property_left_right_selector.gui +++ b/druid/widget/properties_panel/properties/property_left_right_selector.gui @@ -15,6 +15,7 @@ nodes { texture: "druid/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH + layer: "druid" inherit_alpha: true visible: false } @@ -51,6 +52,7 @@ nodes { z: 1.0 } parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -88,6 +90,7 @@ nodes { texture: "druid/rect_round2_width2" id: "button_left" parent: "E_Anchor" + layer: "druid" inherit_alpha: true slice9 { x: 5.0 @@ -109,6 +112,7 @@ nodes { texture: "druid/icon_arrow" id: "icon_left" parent: "button_left" + layer: "druid" inherit_alpha: true size_mode: SIZE_MODE_AUTO } @@ -129,6 +133,7 @@ nodes { texture: "druid/rect_round2_width2" id: "button_right" parent: "E_Anchor" + layer: "druid" inherit_alpha: true slice9 { x: 5.0 @@ -147,6 +152,7 @@ nodes { texture: "druid/icon_arrow" id: "icon_right" parent: "button_right" + layer: "druid" inherit_alpha: true size_mode: SIZE_MODE_AUTO } @@ -170,6 +176,7 @@ nodes { pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH parent: "E_Anchor" + layer: "druid" inherit_alpha: true } nodes { @@ -204,9 +211,16 @@ nodes { z: 1.0 } parent: "E_Anchor" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 } +layers { + name: "druid" +} +layers { + name: "druid_text_bold" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/druid/widget/properties_panel/properties/property_slider.gui b/druid/widget/properties_panel/properties/property_slider.gui index 4a2f739..22b5b3b 100644 --- a/druid/widget/properties_panel/properties/property_slider.gui +++ b/druid/widget/properties_panel/properties/property_slider.gui @@ -15,6 +15,7 @@ nodes { texture: "druid/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH + layer: "druid" inherit_alpha: true visible: false } @@ -51,6 +52,7 @@ nodes { z: 1.0 } parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -89,6 +91,7 @@ nodes { texture: "druid/empty" id: "slider" parent: "E_Anchor" + layer: "druid" inherit_alpha: true } nodes { @@ -105,6 +108,7 @@ nodes { texture: "druid/ui_circle_8" id: "slider_back" parent: "slider" + layer: "druid" inherit_alpha: true slice9 { x: 4.0 @@ -130,6 +134,7 @@ nodes { texture: "druid/ui_circle_8" id: "slider_pin" parent: "slider" + layer: "druid" inherit_alpha: true slice9 { x: 4.0 @@ -153,6 +158,7 @@ nodes { id: "button" pivot: PIVOT_E parent: "E_Anchor" + layer: "druid" inherit_alpha: true slice9 { x: 4.0 @@ -180,6 +186,7 @@ nodes { pivot: PIVOT_SE adjust_mode: ADJUST_MODE_STRETCH parent: "button" + layer: "druid" inherit_alpha: true } nodes { @@ -214,9 +221,16 @@ nodes { z: 1.0 } parent: "button" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 } +layers { + name: "druid" +} +layers { + name: "druid_text_bold" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/druid/widget/properties_panel/properties/property_text.gui b/druid/widget/properties_panel/properties/property_text.gui index 1f1af0a..f1a8937 100644 --- a/druid/widget/properties_panel/properties/property_text.gui +++ b/druid/widget/properties_panel/properties/property_text.gui @@ -15,6 +15,7 @@ nodes { texture: "druid/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH + layer: "druid" inherit_alpha: true visible: false } @@ -51,6 +52,7 @@ nodes { z: 1.0 } parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -88,9 +90,16 @@ nodes { z: 1.0 } parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 } +layers { + name: "druid" +} +layers { + name: "druid_text_bold" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/druid/widget/properties_panel/properties/property_vector3.gui b/druid/widget/properties_panel/properties/property_vector3.gui index 71b30f2..f5091e6 100644 --- a/druid/widget/properties_panel/properties/property_vector3.gui +++ b/druid/widget/properties_panel/properties/property_vector3.gui @@ -19,6 +19,7 @@ nodes { texture: "druid/empty" id: "root" adjust_mode: ADJUST_MODE_STRETCH + layer: "druid" inherit_alpha: true visible: false } @@ -55,6 +56,7 @@ nodes { z: 1.0 } parent: "root" + layer: "druid_text_bold" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -113,6 +115,7 @@ nodes { font: "druid_text_regular" id: "text_x" parent: "field_x" + layer: "druid_text_regular" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -167,7 +170,7 @@ nodes { y: 50.0 } type: TYPE_TEXT - text: "20.0" + text: "20" id: "rich_input_x/input_text" parent: "rich_input_x/root" overridden_fields: 4 @@ -210,6 +213,7 @@ nodes { pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH parent: "field_x" + layer: "druid" inherit_alpha: true } nodes { @@ -250,6 +254,7 @@ nodes { font: "druid_text_regular" id: "text_y" parent: "field_y" + layer: "druid_text_regular" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -304,7 +309,7 @@ nodes { y: 50.0 } type: TYPE_TEXT - text: "20.0" + text: "20" id: "rich_input_y/input_text" parent: "rich_input_y/root" overridden_fields: 4 @@ -347,6 +352,7 @@ nodes { pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH parent: "field_y" + layer: "druid" inherit_alpha: true } nodes { @@ -387,6 +393,7 @@ nodes { font: "druid_text_regular" id: "text_z" parent: "field_z" + layer: "druid_text_regular" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -441,7 +448,7 @@ nodes { y: 50.0 } type: TYPE_TEXT - text: "20.0" + text: "20" id: "rich_input_z/input_text" parent: "rich_input_z/root" overridden_fields: 4 @@ -484,7 +491,17 @@ nodes { pivot: PIVOT_S adjust_mode: ADJUST_MODE_STRETCH parent: "field_z" + layer: "druid" inherit_alpha: true } +layers { + name: "druid" +} +layers { + name: "druid_text_bold" +} +layers { + name: "druid_text_regular" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT diff --git a/druid/widget/properties_panel/properties_panel.gui b/druid/widget/properties_panel/properties_panel.gui index 19982eb..9f801af 100644 --- a/druid/widget/properties_panel/properties_panel.gui +++ b/druid/widget/properties_panel/properties_panel.gui @@ -24,6 +24,7 @@ nodes { texture: "druid/ui_circle_16" id: "root" pivot: PIVOT_N + layer: "druid" inherit_alpha: true slice9 { x: 8.0 @@ -50,6 +51,7 @@ nodes { id: "header" pivot: PIVOT_NE parent: "root" + layer: "druid" inherit_alpha: true slice9 { x: 8.0 @@ -92,6 +94,7 @@ nodes { z: 1.0 } parent: "header" + layer: "druid_text_regular" inherit_alpha: true outline_alpha: 0.0 shadow_alpha: 0.0 @@ -111,6 +114,7 @@ nodes { id: "icon_drag" pivot: PIVOT_NE parent: "header" + layer: "druid" inherit_alpha: true size_mode: SIZE_MODE_AUTO } @@ -129,6 +133,7 @@ nodes { id: "icon_refresh" pivot: PIVOT_NE parent: "header" + layer: "druid" inherit_alpha: true size_mode: SIZE_MODE_AUTO } @@ -150,6 +155,7 @@ nodes { id: "icon_back" pivot: PIVOT_NW parent: "header" + layer: "druid" inherit_alpha: true size_mode: SIZE_MODE_AUTO } @@ -184,8 +190,8 @@ nodes { pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH parent: "content" + layer: "druid" inherit_alpha: true - clipping_mode: CLIPPING_MODE_STENCIL } nodes { size { @@ -198,6 +204,7 @@ nodes { pivot: PIVOT_NW adjust_mode: ADJUST_MODE_STRETCH parent: "scroll_view" + layer: "druid" inherit_alpha: true slice9 { x: 8.0 @@ -214,6 +221,7 @@ nodes { texture: "druid/empty" id: "propeties" parent: "content" + layer: "druid" inherit_alpha: true size_mode: SIZE_MODE_AUTO visible: false @@ -825,5 +833,11 @@ nodes { overridden_fields: 8 template_node_child: true } +layers { + name: "druid" +} +layers { + name: "druid_text_regular" +} material: "/builtins/materials/gui.material" adjust_reference: ADJUST_REFERENCE_PARENT