milestone: layout init

dustpg · Jul 1, 2020 · 8e67a3b · 8e67a3b
1 parent 0305c30
commit 8e67a3b
Show file tree

Hide file tree

Showing 112 changed files with 2,202 additions and 1,573 deletions.
diff --git a/CodeLite/LongUI.txt b/CodeLite/LongUI.txt
@@ -1,2 +1,2 @@
-Debug/up_src_control_gapi_ui_textbox_g.cpp.o Debug/up_src_style_native_ui_win10_abtn.cpp.o Debug/up_src_style_native_ui_win10_cbx.cpp.o Debug/up_src_style_native_ui_win10_group.cpp.o Debug/up_src_style_native_ui_win10_radio.cpp.o Debug/up_src_style_native_ui_win10_tree.cpp.o Debug/up_src_cfunciton_ui_namecolor.c.o Debug/up_src_cfunciton_ui_util.c.o Debug/up_src_cfunciton_view_atof.c.o Debug/up_src_cfunciton_view_unicode.c.o Debug/up_src_container_pod_hash.cpp.o Debug/up_src_container_pod_sharedarray.cpp.o Debug/up_src_container_pod_vector.cpp.o Debug/up_src_container_ui_string_view.cpp.o Debug/up_src_control_ui_button.cpp.o Debug/up_src_control_ui_box.cpp.o Debug/up_src_control_ui_caption.cpp.o Debug/up_src_control_ui_control.cpp.o Debug/up_src_control_ui_image.cpp.o Debug/up_src_control_ui_label.cpp.o Debug/up_src_control_ui_menubar.cpp.o Debug/up_src_control_ui_menulist.cpp.o Debug/up_src_control_ui_progress.cpp.o Debug/up_src_control_ui_radio.cpp.o Debug/up_src_cfunciton_ui_easing.c.o Debug/up_src_control_ui_scale.cpp.o Debug/up_src_control_ui_scrollarea.cpp.o Debug/up_src_control_ui_spacer.cpp.o Debug/up_src_cfunciton_ui_stringcolor.c.o Debug/up_src_control_ui_splitter.cpp.o Debug/up_src_control_ui_checkbox.cpp.o Debug/up_src_control_ui_statusbar.cpp.o Debug/up_src_control_ui_tab.cpp.o Debug/up_src_control_ui_test.cpp.o Debug/up_src_control_ui_toolbar.cpp.o Debug/up_src_control_ui_richlist.cpp.o Debug/up_src_control_ui_tooltip.cpp.o Debug/up_src_style_ui_ssvalue.cpp.o Debug/up_src_effect_ui_effect_backimage.cpp.o Debug/up_src_style_ui_style_value.cpp.o Debug/up_src_text_ui_text_layout.cpp.o Debug/up_src_core_ui_time_capsule.cpp.o Debug/up_src_text_ui_text_outline.cpp.o Debug/up_src_xul_SimpAX.cpp.o Debug/up_src_filesystem_ui_file.cpp.o Debug/up_src_util_ui_named_control.cpp.o Debug/up_src_util_ui_function.cpp.o Debug/up_src_xul_SimpAC.cpp.o Debug/up_src_core_ui_manager.cpp.o Debug/up_src_util_ui_animation.cpp.o Debug/up_src_control_gapi_ui_control_g.cpp.o Debug/up_src_thread_ui_rwlocker.cpp.o Debug/up_src_core_ui_basic_type.cpp.o Debug/up_src_container_ui_string.cpp.o Debug/up_src_core_ui_color.cpp.o Debug/up_src_graphics_ui_cursor.cpp.o Debug/up_src_cfunciton_ui_colorsystem.c.o Debug/up_RichED_ed_txtdoc.cpp.o Debug/up_src_core_ui_all_control_info.cpp.o Debug/up_src_resource_ui_res_image.cpp.o Debug/up_src_util_ui_unicode.cpp.o Debug/up_src_graphics_ui_matrix.cpp.o Debug/up_src_style_native_ui_win10_btn.cpp.o Debug/up_src_control_ui_stackdeck.cpp.o Debug/up_src_control_ui_viewport.cpp.o Debug/up_src_event_ui_event_host.cpp.o Debug/up_RichED_ed_txtcell.cpp.o Debug/up_src_thread_ui_fiber.cpp.o Debug/up_src_graphics_ui_bd_renderer.cpp.o Debug/up_src_control_ui_groupbox.cpp.o Debug/main.cpp.o Debug/up_src_interface_ui_default_config.cpp.o Debug/up_src_util_ui_time_clipboard.cpp.o Debug/up_src_core_ui_window_manager.cpp.o Debug/up_src_style_native_ui_win10.cpp.o Debug/up_src_style_native_ui_win10_tab.cpp.o Debug/up_RichED_ed_txtbuf.cpp.o Debug/up_src_style_native_ui_win10_bg.cpp.o Debug/up_src_thread_ui_waiter.cpp.o Debug/up_src_style_ui_style_state.cpp.o Debug/up_src_private_ui_private_control.cpp.o Debug/up_src_core_ui_window.cpp.o Debug/up_src_control_ui_scrollbar.cpp.o Debug/up_src_graphics_ui_dcomp.cpp.o Debug/up_src_graphics_ui_graphics_util.cpp.o Debug/up_src_resource_ui_resource_id.cpp.o Debug/up_src_resource_ui_bitmap_bank.cpp.o Debug/up_src_style_native_ui_win10_slider.cpp.o Debug/up_src_input_ui_kminput.cpp.o Debug/up_src_graphics_ui_mesh.cpp.o Debug/up_src_util_ui_double_click.cpp.o Debug/up_src_graphics_ui_bg_renderer.cpp.o   
-Debug/up_src_core_ui_control_state.cpp.o Debug/up_src_util_ui_color_sysem.cpp.o Debug/up_src_accessible_ui_accessible_win.cpp.o Debug/up_src_filesystem_ui_findfile.cpp.o Debug/up_src_cfunciton_view_atoi.c.o Debug/up_src_filesystem_ui_fileop.cpp.o Debug/up_src_control_gapi_ui_label_g.cpp.o Debug/up_src_effect_ui_shader_borderimage.cpp.o Debug/up_src_private_ui_private_effect.cpp.o Debug/up_src_graphics_ui_geometry.cpp.o Debug/up_src_debugger_ui_debug_window.cpp.o Debug/up_src_control_ui_list.cpp.o Debug/up_src_effect_ui_shader_backimage.cpp.o Debug/up_src_effect_ui_effect_borderimage.cpp.o Debug/up_src_core_ui_resource_manager.cpp.o Debug/up_src_debugger_ui_tracer.cpp.o Debug/up_src_control_ui_textbox.cpp.o Debug/up_src_debugger_ui_debug.cpp.o Debug/up_src_core_ui_popup_window.cpp.o Debug/up_src_style_ui_ssvalue_list.cpp.o Debug/up_src_core_ui_malloc.cpp.o Debug/up_src_core_ui_hidpi.cpp.o Debug/up_src_style_ui_style.cpp.o Debug/up_src_core_ui_node.cpp.o Debug/up_src_core_ui_control_control.cpp.o Debug/up_src_thread_ui_locker.cpp.o Debug/up_src_core_ui_const_sstring.cpp.o Debug/up_RichED_ed_undoredo.cpp.o Debug/up_src_style_ui_native_style.cpp.o Debug/up_src_control_ui_tree.cpp.o  
+Debug/up_src_control_gapi_ui_textfield_g.cpp.o Debug/up_src_cfunciton_ui_namecolor.c.o Debug/up_src_cfunciton_ui_util.c.o Debug/up_src_cfunciton_view_atof.c.o Debug/up_src_cfunciton_view_unicode.c.o Debug/up_src_container_pod_hash.cpp.o Debug/up_src_container_pod_sharedarray.cpp.o Debug/up_src_container_ui_string_view.cpp.o Debug/up_src_control_ui_button.cpp.o Debug/up_src_control_ui_box.cpp.o Debug/up_src_control_ui_caption.cpp.o Debug/up_src_control_ui_control.cpp.o Debug/up_src_control_ui_image.cpp.o Debug/up_src_control_ui_label.cpp.o Debug/up_src_control_ui_menubar.cpp.o Debug/up_src_control_ui_menulist.cpp.o Debug/up_src_control_ui_progress.cpp.o Debug/up_src_control_ui_radio.cpp.o Debug/up_src_cfunciton_ui_easing.c.o Debug/up_src_control_ui_scale.cpp.o Debug/up_src_control_ui_scrollarea.cpp.o Debug/up_src_control_ui_spacer.cpp.o Debug/up_src_cfunciton_ui_stringcolor.c.o Debug/up_src_control_ui_splitter.cpp.o Debug/up_src_control_ui_checkbox.cpp.o Debug/up_src_control_ui_statusbar.cpp.o Debug/up_src_control_ui_tab.cpp.o Debug/up_src_control_ui_test.cpp.o Debug/up_src_control_ui_toolbar.cpp.o Debug/up_src_control_ui_richlist.cpp.o Debug/up_src_control_ui_tooltip.cpp.o Debug/up_src_control_ui_stackdeck.cpp.o Debug/up_src_control_ui_viewport.cpp.o Debug/up_src_style_ui_ssvalue.cpp.o Debug/up_src_container_pod_vector.cpp.o Debug/up_src_style_ui_win10.cpp.o Debug/up_src_effect_ui_effect_backimage.cpp.o Debug/up_src_style_ui_style_value.cpp.o Debug/up_src_text_ui_text_layout.cpp.o Debug/up_src_core_ui_time_capsule.cpp.o Debug/up_src_text_ui_text_outline.cpp.o Debug/up_src_xul_SimpAX.cpp.o Debug/up_src_filesystem_ui_file.cpp.o Debug/up_src_util_ui_named_control.cpp.o Debug/up_src_util_ui_function.cpp.o Debug/up_src_xul_SimpAC.cpp.o Debug/up_src_core_ui_manager.cpp.o Debug/up_src_util_ui_animation.cpp.o Debug/up_src_core_ui_basic_type.cpp.o Debug/up_src_container_ui_string.cpp.o Debug/up_src_core_ui_color.cpp.o Debug/up_src_graphics_ui_cursor.cpp.o Debug/up_src_cfunciton_ui_colorsystem.c.o Debug/up_RichED_ed_txtdoc.cpp.o Debug/up_src_resource_ui_res_image.cpp.o Debug/up_src_util_ui_unicode.cpp.o Debug/up_src_graphics_ui_matrix.cpp.o Debug/up_src_event_ui_event_host.cpp.o Debug/up_RichED_ed_txtcell.cpp.o Debug/up_src_control_ui_tree.cpp.o Debug/up_RichED_ed_undoredo.cpp.o Debug/up_src_style_ui_native_style.cpp.o Debug/up_src_thread_ui_fiber.cpp.o Debug/up_src_graphics_ui_bd_renderer.cpp.o Debug/up_src_control_ui_groupbox.cpp.o Debug/main.cpp.o Debug/up_src_dragdrop_ui_dragdrop.cpp.o Debug/up_src_interface_ui_default_config.cpp.o Debug/up_src_util_ui_time_clipboard.cpp.o Debug/up_src_core_ui_window_manager.cpp.o Debug/up_RichED_ed_txtbuf.cpp.o Debug/up_src_thread_ui_waiter.cpp.o Debug/up_src_private_ui_private_control.cpp.o Debug/up_src_control_gapi_ui_control_g.cpp.o Debug/up_src_thread_ui_rwlocker.cpp.o Debug/up_src_control_ui_grid.cpp.o Debug/up_src_core_ui_window.cpp.o Debug/up_src_control_ui_scrollbar.cpp.o Debug/up_src_graphics_ui_dcomp.cpp.o Debug/up_src_graphics_ui_graphics_util.cpp.o Debug/up_src_control_ui_spinbuttons.cpp.o Debug/up_src_resource_ui_resource_id.cpp.o Debug/up_src_resource_ui_bitmap_bank.cpp.o Debug/up_src_input_ui_kminput.cpp.o Debug/up_src_graphics_ui_mesh.cpp.o Debug/up_src_util_ui_double_click.cpp.o Debug/up_src_graphics_ui_bg_renderer.cpp.o Debug/up_src_core_ui_control_state.cpp.o Debug/up_src_util_ui_color_sysem.cpp.o Debug/up_src_accessible_ui_accessible_win.cpp.o Debug/up_src_filesystem_ui_findfile.cpp.o Debug/up_src_cfunciton_view_atoi.c.o   
+Debug/up_src_filesystem_ui_fileop.cpp.o Debug/up_src_control_gapi_ui_label_g.cpp.o Debug/up_src_effect_ui_shader_borderimage.cpp.o Debug/up_src_private_ui_private_effect.cpp.o Debug/up_src_graphics_ui_geometry.cpp.o Debug/up_src_debugger_ui_debug_window.cpp.o Debug/up_src_control_ui_list.cpp.o Debug/up_src_effect_ui_shader_backimage.cpp.o Debug/up_src_effect_ui_effect_borderimage.cpp.o Debug/up_src_core_ui_resource_manager.cpp.o Debug/up_src_debugger_ui_tracer.cpp.o Debug/up_src_control_ui_textbox.cpp.o Debug/up_src_control_ui_textfield.cpp.o Debug/up_src_debugger_ui_debug.cpp.o Debug/up_src_core_ui_popup_window.cpp.o Debug/up_src_style_ui_ssvalue_list.cpp.o Debug/up_src_core_ui_malloc.cpp.o Debug/up_src_core_ui_hidpi.cpp.o Debug/up_src_style_ui_style.cpp.o Debug/up_src_core_ui_node.cpp.o Debug/up_src_core_ui_control_control.cpp.o Debug/up_src_thread_ui_locker.cpp.o Debug/up_src_core_ui_const_sstring.cpp.o Debug/up_src_core_ui_all_control_info.cpp.o  
diff --git a/CodeUI/CodeUI.vcxproj b/CodeUI/CodeUI.vcxproj
@@ -177,6 +177,7 @@
     <ClCompile Include="..\src\control\gapi\ui_control_g.cpp" />
     <ClCompile Include="..\src\control\gapi\ui_label_g.cpp" />
     <ClCompile Include="..\src\control\gapi\ui_textfield_g.cpp" />
+    <ClCompile Include="..\src\control\ui_arrowscrollbox.cpp" />
     <ClCompile Include="..\src\control\ui_box.cpp" />
     <ClCompile Include="..\src\control\ui_button.cpp" />
     <ClCompile Include="..\src\control\ui_caption.cpp" />
@@ -302,6 +303,7 @@
     <ClInclude Include="..\include\container\pod_sharedarray.h" />
     <ClInclude Include="..\include\container\pod_vector.h" />
     <ClInclude Include="..\include\container\ui_string_vector.h" />
+    <ClInclude Include="..\include\control\ui_arrowscrollbox.h" />
     <ClInclude Include="..\include\control\ui_box.h" />
     <ClInclude Include="..\include\control\ui_button.h" />
     <ClInclude Include="..\include\control\ui_caption.h" />
@@ -454,7 +456,7 @@
     <ClInclude Include="..\include\util\ui_clipboard.h" />
     <ClInclude Include="..\include\util\ui_ctordtor.h" />
     <ClInclude Include="..\include\util\ui_fookgcc.h" />
-    <ClInclude Include="..\include\util\ui_lastsort.h" />
+    <ClInclude Include="..\include\util\ui_sort.h" />
     <ClInclude Include="..\include\util\ui_aniamtion.h" />
     <ClInclude Include="..\include\util\ui_color_system.h" />
     <ClInclude Include="..\include\util\ui_little_math.h" />

diff --git a/CodeUI/CodeUI.vcxproj.filters b/CodeUI/CodeUI.vcxproj.filters
@@ -494,6 +494,9 @@
     <ClCompile Include="..\src\dragdrop\ui_dragdrop.cpp">
       <Filter>source\dragdrop</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\control\ui_arrowscrollbox.cpp">
+      <Filter>source\control</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\src\naivis\z_string.natvis">
@@ -804,9 +807,6 @@
     <ClInclude Include="..\include\style\ui_style_state.h">
       <Filter>header\style</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\util\ui_lastsort.h">
-      <Filter>header\util</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\graphics\ui_bd_renderer.h">
       <Filter>header\graphics</Filter>
     </ClInclude>
@@ -1113,6 +1113,12 @@
     <ClInclude Include="..\include\dropdrag\ui_dropdrag_impl.h">
       <Filter>header\dragdrop</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\util\ui_sort.h">
+      <Filter>header\util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\control\ui_arrowscrollbox.h">
+      <Filter>header\control</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="..\helper\BorderImageEffectPS.hlsl">

diff --git a/License.txt b/License.txt
@@ -1,13 +1,4 @@
-Overview:
-  --------------------------------------------
-  LongUI             |   MIT License
-  --------------------------------------------
-
-  --------------------------------------------
-
-LongUI License:
-
-* Copyright (c) 2014-2020 dustpg   mailto:[email protected]
+* Copyright (c) 2014-2020 dustpg   mailto:[email protected]
 *
 * Permission is hereby granted, free of charge, to any person
 * obtaining a copy of this software and associated documentation

diff --git a/LongUI.sln b/LongUI.sln
@@ -5,6 +5,11 @@ VisualStudioVersion = 15.0.28307.1082
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodeUI", "CodeUI\CodeUI.vcxproj", "{68DBE32A-6DDF-4E22-B265-8AC889B912F4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AaaaUI", "AaaaUI\AaaaUI.vcxproj", "{C4D7009E-D596-41AC-B46D-A3166B7286C3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{68DBE32A-6DDF-4E22-B265-8AC889B912F4} = {68DBE32A-6DDF-4E22-B265-8AC889B912F4}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -21,6 +26,14 @@ Global
 		{68DBE32A-6DDF-4E22-B265-8AC889B912F4}.Release|x64.Build.0 = Release|x64
 		{68DBE32A-6DDF-4E22-B265-8AC889B912F4}.Release|x86.ActiveCfg = Release|Win32
 		{68DBE32A-6DDF-4E22-B265-8AC889B912F4}.Release|x86.Build.0 = Release|Win32
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Debug|x64.ActiveCfg = Debug|x64
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Debug|x64.Build.0 = Debug|x64
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Debug|x86.ActiveCfg = Debug|Win32
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Debug|x86.Build.0 = Debug|Win32
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Release|x64.ActiveCfg = Release|x64
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Release|x64.Build.0 = Release|x64
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Release|x86.ActiveCfg = Release|Win32
+		{C4D7009E-D596-41AC-B46D-A3166B7286C3}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TODO.txt b/TODO.txt
@@ -2,6 +2,24 @@
 
 ACCESSIBLE
 
+BOX add_child
+
+<FindBasicAnimation> 动画使用指针，避免上锁
+
+滚动条 ギリギリ
+
+ScrollArea 取消 m_minScrollSize m_maxScrollSize?
+
+adjust_align
+
+Update 排序 [ fitting->下到上 sizing->上到下 ]
+
+SetText 仅保留 View接口
+
+Appearance Set - Style Link - initialize ?
+
+修改基本参考座标为内容座标?
+
 富文本支持
 
 <progressmeter> 对接操作系统状态

diff --git a/demo/demo2_eventhandle/demo2.cpp b/demo/demo2_eventhandle/demo2.cpp
@@ -53,7 +53,7 @@ class MyViewport final : public LongUI::UIViewport {
         m_pDisplay = display;
         // #EVENT1
         find_button("exit")->AddGuiEventListener(
-            UIButton::_onCommand(), [display](UIControl&) noexcept {
+            UIButton::_onCommand(), [display](const GuiEventArg&) noexcept {
             // Time Capsule
             UIManager.CreateTimeCapsule([display](float p) noexcept {
                 CUIString text;
@@ -65,7 +65,7 @@ class MyViewport final : public LongUI::UIViewport {
         });
         // #EVENT2
         find_button("exit")->AddGuiEventListener(
-            UIButton::_onCommand(), [display](UIControl&) noexcept {
+            UIButton::_onCommand(), [display](const GuiEventArg&) noexcept {
             display->SetText(u"now exit in 0.49sec!"_sv);
             // Time Capsule# 2
             UIManager.CreateTimeCapsule([display](float p) noexcept {
@@ -76,7 +76,7 @@ class MyViewport final : public LongUI::UIViewport {
         });
         // #EVENT3
         find_button("exit")->AddGuiEventListener(
-            UIButton::_onCommand(), [display](UIControl&) noexcept {
+            UIButton::_onCommand(), [display](const GuiEventArg&) noexcept {
             display->SetText(u"here never arrived! because of Disconnect!"_sv);
             return Event_Accept;
         }).Disconnect();
@@ -88,8 +88,8 @@ class MyViewport final : public LongUI::UIViewport {
         {
         case NoticeEvent::Event_UIEvent:
         {
-            auto& guie = static_cast<const EventGuiArg&>(e);
-            switch (guie.GetEvent())
+            auto& guie = static_cast<const GuiEventArg&>(e);
+            switch (guie.GetType())
             {
             case UIButton::_onCommand():
                 if (const auto btn = uisafe_cast<UIButton>(sender)) {

diff --git a/demo/demo3_customconfig/demo3.cpp b/demo/demo3_customconfig/demo3.cpp
@@ -8,6 +8,7 @@
 #include <control/ui_menulist.h>
 #include <control/ui_menupopup.h>
 
+
 #include "customconfig.h"
 
 
@@ -82,7 +83,7 @@ void InitButton(
     const auto menu = longui_cast<LongUI::UIMenuList*>(list);
     assert(btn && menu && "BAD ACTION");
     btn->AddGuiEventListener(LongUI::UIButton::_onCommand(), 
-        [&cfg, menu](LongUI::UIControl&) noexcept {
+        [&cfg, menu](const LongUI::GuiEventArg&) noexcept {
         const auto index = menu->GetSelectedIndex();
         // index < 0 -> not selected
         if (index < 0) return LongUI::Event_Ignore;

diff --git a/demo/demo4_customcontrol/mytoggle.cpp b/demo/demo4_customcontrol/mytoggle.cpp
@@ -23,7 +23,9 @@ namespace Demo {
         m_top0 = ColorF::FromRGBA_CT<RGBA_Black>();
         m_top1 = ColorF::FromRGBA_CT<RGBA_White>();
         m_oBox.border = { 1,1,1,1 };
-        this->SetStyleMinSize({ MyToggleMM , MyToggleMH });
+        this->set_limited_width_lp(MyToggleMM);
+        this->set_limited_height_lp(MyToggleMH);
+        this->update_fitting_size({ MyToggleMM , MyToggleMH });
     }
     /// <summary>
     /// Does the event.
@@ -125,7 +127,7 @@ namespace Demo {
             this->Invalidate();
         }, m_time, this);
         // trigger 'oncommand'
-        this->FireEvent(this->_onCommand());
+        this->FireSimpleEvent(this->_onCommand());
         // TODO: ACCESSIBLE
 #ifndef LUI_ACCESSIBLE
 

diff --git a/demo/demo4_customcontrol/mytoggleex.cpp b/demo/demo4_customcontrol/mytoggleex.cpp
@@ -26,7 +26,9 @@ namespace Demo {
         m_top0 = ColorF::FromRGBA_CT<RGBA_Black>();
         m_top1 = ColorF::FromRGBA_CT<RGBA_White>();
         m_oBox.border = { 1,1,1,1 };
-        this->SetStyleMinSize({ MyToggleMM , MyToggleMH });
+        this->set_limited_width_lp(MyToggleMM);
+        this->set_limited_height_lp(MyToggleMH);
+        this->update_fitting_size({ MyToggleMM , MyToggleMH });
     }
     /// <summary>
     /// initialize MyToggleEx
@@ -169,7 +171,7 @@ namespace Demo {
             this->Invalidate();
         }, m_time, this);
         // trigger 'oncommand'
-        this->FireEvent(this->_onCommand());
+        this->FireSimpleEvent(this->_onCommand());
         // TODO: ACCESSIBLE
 #ifndef LUI_ACCESSIBLE
 

diff --git a/demo/demo5_fullcontrol/checkbox.cpp b/demo/demo5_fullcontrol/checkbox.cpp
@@ -13,8 +13,8 @@ void InitViewport_CheckBox(LongUI::UIViewport& viewport) noexcept {
     auto& window = viewport.RefWindow();
     struct set_label_text {
         UILabel*    display = nullptr;
-        auto operator()(UIControl& ctrl) noexcept {
-            const auto checkbox = longui_cast<UICheckBox*>(&ctrl);
+        auto operator()(const GuiEventArg& arg) noexcept {
+            const auto checkbox = longui_cast<UICheckBox*>(arg.current);
             display->SetText(checkbox->RefText());
             return Event_Accept;
         }

diff --git a/demo/demo5_fullcontrol/demo5_fullcontrol.vcxproj b/demo/demo5_fullcontrol/demo5_fullcontrol.vcxproj
@@ -20,6 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="checkbox.cpp" />
+    <ClCompile Include="control_tree.cpp" />
     <ClCompile Include="demo5_main.cpp" />
     <ClCompile Include="demo5_init.cpp" />
     <ClCompile Include="radio.cpp" />

diff --git a/demo/demo5_fullcontrol/demo5_fullcontrol.vcxproj.filters b/demo/demo5_fullcontrol/demo5_fullcontrol.vcxproj.filters
@@ -8,5 +8,6 @@
     <ClCompile Include="demo5_init.cpp" />
     <ClCompile Include="demo5_main.cpp" />
     <ClCompile Include="stack.cpp" />
+    <ClCompile Include="control_tree.cpp" />
   </ItemGroup>
 </Project>