From 11dc816878461979bdbe6a98e4fd6bb08d07bfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Capello?= Date: Wed, 30 Nov 2022 16:46:40 -0300 Subject: [PATCH] Add "capture" state to style layer states --- src/app/ui/skin/skin_theme.cpp | 1 + src/ui/style.h | 1 + src/ui/theme.cpp | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp index d0e1f9c9f..accd31370 100644 --- a/src/app/ui/skin/skin_theme.cpp +++ b/src/app/ui/skin/skin_theme.cpp @@ -666,6 +666,7 @@ void SkinTheme::loadXml(BackwardCompatibility* backward) if (state.find("selected") != std::string::npos) flags |= ui::Style::Layer::kSelected; if (state.find("focus") != std::string::npos) flags |= ui::Style::Layer::kFocus; if (state.find("mouse") != std::string::npos) flags |= ui::Style::Layer::kMouse; + if (state.find("capture") != std::string::npos) flags |= ui::Style::Layer::kCapture; layer.setFlags(flags); } diff --git a/src/ui/style.h b/src/ui/style.h index 441488089..d93c6bae5 100644 --- a/src/ui/style.h +++ b/src/ui/style.h @@ -48,6 +48,7 @@ namespace ui { kFocus = 2, kSelected = 4, kDisabled = 8, + kCapture = 16 }; Layer() diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp index 1e057388a..861686cdd 100644 --- a/src/ui/theme.cpp +++ b/src/ui/theme.cpp @@ -123,7 +123,8 @@ int PaintWidgetPartInfo::getStyleFlagsForWidget(const Widget* widget) (widget->isEnabled() ? 0: Style::Layer::kDisabled) | (widget->isSelected() ? Style::Layer::kSelected: 0) | (widget->hasMouse() ? Style::Layer::kMouse: 0) | - (widget->hasFocus() ? Style::Layer::kFocus: 0); + (widget->hasFocus() ? Style::Layer::kFocus: 0) | + (widget->hasCapture() ? Style::Layer::kCapture: 0); } Theme::Theme()