#571 WIP: Fix mouse wheeling outside main window

directvt · Jun 29, 2024 · 24758e6 · 24758e6
1 parent 041d142
commit 24758e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/netxs/apps/test.hpp b/src/netxs/apps/test.hpp
@@ -153,20 +153,20 @@ Using large type pieces:
                     .bld(true).itc(true).add(" Bold + Italic WVMQWERTYUIOPASDFGHJKLZXCVBNM韓M😎M 🥵🥵", vss<11>, "🦚😀⛷🏂😁😂😃😄😅😆👌🐞😎👪.\n")
                     .bld(faux).itc(true).add("        Italic WVMQWERTYUIOPASDFGHJKLZXCVBNM韓M😎M 🥵🥵", vss<11>, "🦚😀⛷🏂😁😂😃😄😅😆👌🐞😎👪.\n")
                     .nil().add("\n")
-                    .add("Underline:\n")
-                    .add(" ").und(unln::biline).add("Double Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::line  ).add("Plain Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::dashed).add("Dashed Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::dotted).add("Dotted Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::wavy  ).add("Wavy Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::line  ).unc(argb{ purered }).add("Red Plain Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::wavy  ).unc(argb{ purered }).add("Red Wavy Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::wavy  ).unc(argb{ purewhite }).add("White Wavy Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::line  ).unc(argb{ purewhite }).add("White Plain Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::wavy  ).unc(argb{ pureblack }).add("Black Wavy Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::line  ).unc(argb{ pureblack }).add("Black Plain Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::wavy  ).unc(argb{ purered }).blk(true).add("Blinking Wavy Underline █gj║").und(unln::none).eol()
-                    .add(" ").und(unln::line  ).unc(argb{ purewhite }).blk(true).add("Blinking Plain Underline █gj║").und(unln::none).eol()
+                    .fgc(purecyan).add("Styled Underlines:\n")
+                    .add(" ").und(unln::biline).add("Double Underline").und(unln::none).eol()
+                    .add(" ").und(unln::line  ).add("Plain Underline").und(unln::none).eol()
+                    .add(" ").und(unln::dashed).add("Dashed Underline").und(unln::none).eol()
+                    .add(" ").und(unln::dotted).add("Dotted Underline").und(unln::none).eol()
+                    .add(" ").und(unln::wavy  ).add("Wavy Underline").und(unln::none).eol()
+                    //.add(" ").und(unln::wavy  ).unc(argb{ puregreen }).add("Green Wavy Underline").und(unln::none).eol()
+                    //.add(" ").und(unln::line  ).unc(argb{ puregreen }).add("Green Plain Underline").und(unln::none).eol()
+                    .add(" ").und(unln::line  ).unc(argb{ purewhite }).add("White Plain Underline").und(unln::none).eol()
+                    .add(" ").und(unln::wavy  ).unc(argb{ purewhite }).add("White Wavy Underline").und(unln::none).eol()
+                    .add(" ").und(unln::line  ).unc(argb{ pureblack }).add("Black Plain Underline").und(unln::none).eol()
+                    .add(" ").und(unln::wavy  ).unc(argb{ pureblack }).add("Black Wavy Underline").und(unln::none).eol()
+                    //.add(" ").und(unln::wavy  ).unc(argb{ purered }).blk(true).add("Blinking Wavy Underline").und(unln::none).eol()
+                    //.add(" ").und(unln::line  ).unc(argb{ purewhite }).blk(true).add("Blinking Plain Underline").und(unln::none).eol()
                     .nil().add("\n")
                     .fgc(purecyan).bld(faux).add("Devanagari script:\n")
                     .add("\2अनुच्छेद", vss<51>, " १.\n"     // अनुच्छेद १.

diff --git a/src/netxs/desktopio/gui.hpp b/src/netxs/desktopio/gui.hpp
@@ -2657,10 +2657,11 @@ namespace netxs::gui
             }
             mcoord = coord;
             auto leave = std::exchange(inside, !szgrip.seized && (seized || inner_rect.hittest(mcoord))) != inside;
+            auto coordxy = fp2d{ mcoord - inner_rect.coor } / cellsz;
+            auto changed = proxy.m.coordxy(coordxy);
             if (inside)
             {
-                auto coordxy = fp2d{ mcoord - inner_rect.coor } / cellsz;
-                if (proxy.m.coordxy(coordxy))
+                if (changed)
                 {
                     auto timecode = datetime::now();
                     proxy.m.changed++;