From fc4781dcaf4503f8e28e9e219d734aca3f9d425d Mon Sep 17 00:00:00 2001
From: Aleksander <aleksander@oo8.dev>
Date: Mon, 6 Oct 2025 18:06:24 +0200
Subject: [PATCH] fix wlx build

---
 wlx-overlay-s/src/gui/panel/button.rs          |  5 +++--
 wlx-overlay-s/src/gui/panel/label.rs           | 14 +++++++-------
 wlx-overlay-s/src/overlays/keyboard/builder.rs | 11 ++++++-----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 9ed0899..e0862b7 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -7,6 +7,7 @@ use std::{
 use wgui::{
     event::{self, EventCallback, EventListenerCollection, EventListenerKind, ListenerHandleVec},
     parser::CustomAttribsInfoOwned,
+    widget::EventResult,
 };
 
 use crate::state::AppState;
@@ -43,7 +44,7 @@ pub(super) fn setup_custom_button<S>(
                 #[cfg(feature = "wayvr")]
                 app.tasks
                     .enqueue(TaskType::WayVR(WayVRAction::ToggleDashboard));
-                Ok(())
+                Ok(EventResult::Consumed)
             }),
             "::SetToggle" => {
                 let arg = args.next().unwrap_or_default();
@@ -53,7 +54,7 @@ pub(super) fn setup_custom_button<S>(
                 };
                 Box::new(move |_common, _data, app, _| {
                     app.tasks.enqueue(TaskType::ToggleSet(set_idx));
-                    Ok(())
+                    Ok(EventResult::Consumed)
                 })
             }
             "::WatchHide" => todo!(),
diff --git a/wlx-overlay-s/src/gui/panel/label.rs b/wlx-overlay-s/src/gui/panel/label.rs
index 461d9f1..f480558 100644
--- a/wlx-overlay-s/src/gui/panel/label.rs
+++ b/wlx-overlay-s/src/gui/panel/label.rs
@@ -15,8 +15,8 @@ use wgui::{
     event::{self, EventCallback, EventListenerCollection, ListenerHandleVec},
     i18n::Translation,
     layout::Layout,
-    parser::{parse_color_hex, CustomAttribsInfoOwned},
-    widget::label::WidgetLabel,
+    parser::{CustomAttribsInfoOwned, parse_color_hex},
+    widget::{EventResult, label::WidgetLabel},
 };
 
 use crate::state::AppState;
@@ -53,7 +53,7 @@ pub(super) fn setup_custom_label<S>(
             };
             Box::new(move |common, data, _app, _| {
                 shell_on_tick(&state, common, data);
-                Ok(())
+                Ok(EventResult::Pass)
             })
         }
         "fifo" => {
@@ -71,7 +71,7 @@ pub(super) fn setup_custom_label<S>(
             };
             Box::new(move |common, data, _app, _| {
                 pipe_on_tick(&state, common, data);
-                Ok(())
+                Ok(EventResult::Pass)
             })
         }
         "battery" => {
@@ -104,7 +104,7 @@ pub(super) fn setup_custom_label<S>(
             };
             Box::new(move |common, data, app, _| {
                 battery_on_tick(&state, common, data, app);
-                Ok(())
+                Ok(EventResult::Pass)
             })
         }
         "clock" => {
@@ -167,12 +167,12 @@ pub(super) fn setup_custom_label<S>(
 
             Box::new(move |common, data, _app, _| {
                 clock_on_tick(&state, common, data);
-                Ok(())
+                Ok(EventResult::Pass)
             })
         }
         "ipd" => Box::new(|common, data, app, _| {
             ipd_on_tick(common, data, app);
-            Ok(())
+            Ok(EventResult::Pass)
         }),
         unk => {
             log::warn!("Unknown source value for label: {unk}");
diff --git a/wlx-overlay-s/src/overlays/keyboard/builder.rs b/wlx-overlay-s/src/overlays/keyboard/builder.rs
index f16479a..91016ee 100644
--- a/wlx-overlay-s/src/overlays/keyboard/builder.rs
+++ b/wlx-overlay-s/src/overlays/keyboard/builder.rs
@@ -11,6 +11,7 @@ use wgui::{
     renderer_vk::util,
     taffy::{self, prelude::length},
     widget::{
+        EventResult,
         div::WidgetDiv,
         rectangle::{WidgetRectangle, WidgetRectangleParams},
         util::WLength,
@@ -198,7 +199,7 @@ pub fn create_keyboard(
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
                             on_enter_anim(k.clone(), common, data);
-                            Ok(())
+                            Ok(EventResult::Pass)
                         }
                     }),
                 );
@@ -211,7 +212,7 @@ pub fn create_keyboard(
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
                             on_leave_anim(k.clone(), common, data);
-                            Ok(())
+                            Ok(EventResult::Pass)
                         }
                     }),
                 );
@@ -228,7 +229,7 @@ pub fn create_keyboard(
 
                             handle_press(app, &k, state, button);
                             on_press_anim(k.clone(), common, data);
-                            Ok(())
+                            Ok(EventResult::Pass)
                         }
                     }),
                 );
@@ -242,7 +243,7 @@ pub fn create_keyboard(
                             if handle_release(app, &k, state) {
                                 on_release_anim(k.clone(), common, data);
                             }
-                            Ok(())
+                            Ok(EventResult::Pass)
                         }
                     }),
                 );
@@ -260,7 +261,7 @@ pub fn create_keyboard(
                                 } else {
                                     on_release_anim(k.clone(), common, data);
                                 }
-                                Ok(())
+                                Ok(EventResult::Pass)
                             }
                         }),
                     );