tryfix windows

aui-framework · Jan 5, 2025 · 42b568c · 42b568c
1 parent fd9e659
commit 42b568c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/aui.core/src/AUI/Traits/concepts.h b/aui.core/src/AUI/Traits/concepts.h
@@ -182,8 +182,10 @@ concept ACompatibleSlotFor = requires (Slot&& c) {
 
 class API_AUI_CORE AObjectBase;
 
+struct ASlotDefBase {};
+
 template<aui::convertible_to<AObjectBase*> ObjectPtr, typename Invocable>
-struct ASlotDef {
+struct ASlotDef: ASlotDefBase {
     ObjectPtr boundObject;
     Invocable invocable;
 };

diff --git a/aui.views/src/AUI/Util/ADataBinding.h b/aui.views/src/AUI/Util/ADataBinding.h
@@ -507,7 +507,7 @@ inline const _<Object>& operator&(const _<Object>& object, Connectable&& binding
         using Binding = ADataBindingDefault<std::decay_t<Object>, std::decay_t<T>...>;
         static_assert(
             requires { { Binding::property(object) } -> AAnyProperty; } ||
-                requires { { ASlotDef(Binding::property(object)) };},
+                requires { { Binding::property(object) } -> aui::derived_from<ASlotDefBase>; },
             "ADataBindingDefault is required to have property() function to return any property or slot def; either "
             "define proper ADataBindingDefault specialization or explicitly specify the destination property.");
         static_assert(

diff --git a/aui.views/src/AUI/View/AAbstractLabel.cpp b/aui.views/src/AUI/View/AAbstractLabel.cpp
@@ -219,7 +219,7 @@ AString AAbstractLabel::getTransformedText() {
 
 void AAbstractLabel::onDpiChanged() {
     AView::onDpiChanged();
-    ui_threadX [&] {
+    ui_threadX [this, self = shared_from_this()] {
         mPrerendered = nullptr;
         redraw();
     };