From bdc1bf87b2cce8f4650d786d87bcebd1c3d943a4 Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Sun, 14 Dec 2025 00:32:50 +0900 Subject: [PATCH 1/3] sunset theme.xml in favor of globals --- wgui/src/drawing.rs | 2 +- wgui/src/parser/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wgui/src/drawing.rs b/wgui/src/drawing.rs index 4f4b4c4..123d84f 100644 --- a/wgui/src/drawing.rs +++ b/wgui/src/drawing.rs @@ -9,7 +9,7 @@ use crate::{ event::EventAlterables, globals::Globals, layout::Widget, - renderer_vk::text::{TextShadow, custom_glyph::CustomGlyph}, + renderer_vk::text::{custom_glyph::CustomGlyph, TextShadow}, stack::{self, ScissorBoundary, ScissorStack, TransformStack}, widget::{self, ScrollbarInfo, WidgetState}, }; diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs index cd137ee..6afd0fd 100644 --- a/wgui/src/parser/mod.rs +++ b/wgui/src/parser/mod.rs @@ -8,7 +8,7 @@ mod widget_rectangle; mod widget_sprite; use crate::{ - assets::{AssetPath, AssetPathOwned, normalize_path}, + assets::{normalize_path, AssetPath, AssetPathOwned}, components::{Component, ComponentWeak}, drawing::{self}, globals::WguiGlobals, From 326b0d710c0c33a2f504bc404d8f29915b2eaf99 Mon Sep 17 00:00:00 2001 From: Aleksander Date: Tue, 16 Dec 2025 18:57:10 +0100 Subject: [PATCH 2/3] make toasts pretty --- wgui/doc/widgets.md | 4 ++++ wgui/src/parser/widget_label.rs | 10 ++++++++- wlx-overlay-s/src/assets/gui/toast.xml | 27 ++++++++++++++++++------- wlx-overlay-s/src/assets/icons/bell.svg | 3 +++ 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 wlx-overlay-s/src/assets/icons/bell.svg diff --git a/wgui/doc/widgets.md b/wgui/doc/widgets.md index 0587c25..a1f6573 100644 --- a/wgui/doc/widgets.md +++ b/wgui/doc/widgets.md @@ -104,6 +104,10 @@ _Translated by key_ _Text size in pixel units_ +`wrap`: "1" | "0" (default: "0") + +_Enable text wrapping?_ + `color`: #FFAABB | #FFAABBCC `align`: "left" | "right" | "center" | "justified" | "end" diff --git a/wgui/src/parser/widget_label.rs b/wgui/src/parser/widget_label.rs index 2ef6ddc..71c567e 100644 --- a/wgui/src/parser/widget_label.rs +++ b/wgui/src/parser/widget_label.rs @@ -2,7 +2,8 @@ use crate::{ i18n::Translation, layout::WidgetID, parser::{ - AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, + AttribPair, ParserContext, ParserFile, parse_check_i32, parse_children, parse_i32, parse_widget_universal, + print_invalid_attrib, style::{parse_style, parse_text_style}, }, widget::label::{WidgetLabel, WidgetLabelParams}, @@ -23,6 +24,13 @@ pub fn parse_widget_label<'a>( for pair in attribs { let (key, value) = (pair.attrib.as_ref(), pair.value.as_ref()); match key { + "wrap" => { + if let Some(num) = parse_i32(value) { + params.style.wrap = num == 1; + } else { + print_invalid_attrib(key, value); + } + } "text" => { if !value.is_empty() { params.content = Translation::from_raw_text(value); diff --git a/wlx-overlay-s/src/assets/gui/toast.xml b/wlx-overlay-s/src/assets/gui/toast.xml index deb0ae9..c916932 100644 --- a/wlx-overlay-s/src/assets/gui/toast.xml +++ b/wlx-overlay-s/src/assets/gui/toast.xml @@ -1,14 +1,27 @@ -
- -
-