Merge pull request #781 from o-sdn-o/gui-bridge

o-sdn-o · web-flow · commit 73178af74eda · 2025-08-04T01:46:07.000+05:00
Allows precise (1:1) scrolling using the orthogonal axis
diff --git a/src/netxs/desktopio/application.hpp b/src/netxs/desktopio/application.hpp
@@ -22,7 +22,7 @@ namespace netxs::app
 
 namespace netxs::app::shared
 {
-    static const auto version = "v2025.08.03b";
+    static const auto version = "v2025.08.04";
     static const auto repository = "https://github.com/directvt/vtm";
     static const auto usr_config = "~/.config/vtm/settings.xml"s;
     static const auto sys_config = "/etc/vtm/settings.xml"s;
diff --git a/src/netxs/desktopio/controls.hpp b/src/netxs/desktopio/controls.hpp
@@ -4644,9 +4644,13 @@ namespace netxs::ui
                 scroll_len = std::max(1, new_size[Axis]);
                 m_to_s();
             }
-            void stepby(fp32 delta)
+            void stepby(fp2d delta)
             {
-                scroll_air = grip_origin + delta;
+                static constexpr auto Sixa = !Axis; // Orthogonal axis.
+                auto d1 = std::abs(delta[Axis]);
+                auto d2 = std::abs(delta[Sixa]);
+                if (d1 > d2) scroll_air = grip_origin + delta[Axis];
+                else         scroll_air = grip_origin + delta[Sixa] * r; // Allows precise (1:1) scrolling using the orthogonal axis.
                 s_to_m();
             }
             void commit(rect& handle)
@@ -4755,7 +4759,7 @@ namespace netxs::ui
                     }
                     else
                     {
-                        if (auto delta = (gear.coord - drag_origin)[Axis])
+                        if (auto delta = gear.coord - drag_origin)
                         {
                             calc.stepby(delta);
                             send<e2::form::upon::scroll::bycoor::_<Axis>>();
@@ -4775,10 +4779,10 @@ namespace netxs::ui
                     auto dir = calc.inside(twod{ gear.coord }[Axis]);
                     if (dir == 0) // Inside the grip.
                     {
-                        calc.captured = true;
                         drag_origin = gear.coord;
                         calc.m_to_s();
                         calc.grip_origin = calc.scroll_air;
+                        calc.captured = true;
                     }
                     else // Outside the grip.
                     {
diff --git a/src/netxs/desktopio/lixx.hpp b/src/netxs/desktopio/lixx.hpp
@@ -2669,10 +2669,10 @@ namespace netxs::lixx // li++, libinput++.
                                             }
                                         }
                                         break;
-                    case M_VERSION:     if (m->version == s->match->version)                            matched_flags |= flag; break;
-                    case M_DMI:         if (::fnmatch(s->match->dmi2.data(), m->dmi2.data(), 0) == 0)   matched_flags |= flag; break;
-                    case M_DT:          if (::fnmatch(s->match->dt2.data(), m->dt2.data(), 0) == 0)     matched_flags |= flag; break;
-                    case M_UDEV_TYPE:   if (s->match->ud_type & m->ud_type)                             matched_flags |= flag; break;
+                    case M_VERSION:     if (m->version == s->match->version)                          { matched_flags |= flag; } break;
+                    case M_DMI:         if (::fnmatch(s->match->dmi2.data(), m->dmi2.data(), 0) == 0) { matched_flags |= flag; } break;
+                    case M_DT:          if (::fnmatch(s->match->dt2.data(), m->dt2.data(), 0) == 0)   { matched_flags |= flag; } break;
+                    case M_UDEV_TYPE:   if (s->match->ud_type & m->ud_type)                           { matched_flags |= flag; } break;
                     default: ::abort();
                 }
                 if (prev_matched_flags != matched_flags)

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace netxs::app`
`22`	`22`
`23`	`23`	`namespace netxs::app::shared`
`24`	`24`	`{`
`25`		`- static const auto version = "v2025.08.03b";`
	`25`	`+ static const auto version = "v2025.08.04";`
`26`	`26`	`static const auto repository = "https://github.com/directvt/vtm";`
`27`	`27`	`static const auto usr_config = "~/.config/vtm/settings.xml"s;`
`28`	`28`	`static const auto sys_config = "/etc/vtm/settings.xml"s;`
Original file line number	Diff line number	Diff line change
`@@ -4644,9 +4644,13 @@ namespace netxs::ui`
`4644`	`4644`	`scroll_len = std::max(1, new_size[Axis]);`
`4645`	`4645`	`m_to_s();`
`4646`	`4646`	`}`
`4647`		`- void stepby(fp32 delta)`
	`4647`	`+ void stepby(fp2d delta)`
`4648`	`4648`	`{`
`4649`		`- scroll_air = grip_origin + delta;`
	`4649`	`+ static constexpr auto Sixa = !Axis; // Orthogonal axis.`
	`4650`	`+ auto d1 = std::abs(delta[Axis]);`
	`4651`	`+ auto d2 = std::abs(delta[Sixa]);`
	`4652`	`+ if (d1 > d2) scroll_air = grip_origin + delta[Axis];`
	`4653`	`+ else scroll_air = grip_origin + delta[Sixa] * r; // Allows precise (1:1) scrolling using the orthogonal axis.`
`4650`	`4654`	`s_to_m();`
`4651`	`4655`	`}`
`4652`	`4656`	`void commit(rect& handle)`
`@@ -4755,7 +4759,7 @@ namespace netxs::ui`
`4755`	`4759`	`}`
`4756`	`4760`	`else`
`4757`	`4761`	`{`
`4758`		`- if (auto delta = (gear.coord - drag_origin)[Axis])`
	`4762`	`+ if (auto delta = gear.coord - drag_origin)`
`4759`	`4763`	`{`
`4760`	`4764`	`calc.stepby(delta);`
`4761`	`4765`	`send<e2::form::upon::scroll::bycoor::_<Axis>>();`
`@@ -4775,10 +4779,10 @@ namespace netxs::ui`
`4775`	`4779`	`auto dir = calc.inside(twod{ gear.coord }[Axis]);`
`4776`	`4780`	`if (dir == 0) // Inside the grip.`
`4777`	`4781`	`{`
`4778`		`- calc.captured = true;`
`4779`	`4782`	`drag_origin = gear.coord;`
`4780`	`4783`	`calc.m_to_s();`
`4781`	`4784`	`calc.grip_origin = calc.scroll_air;`
	`4785`	`+ calc.captured = true;`
`4782`	`4786`	`}`
`4783`	`4787`	`else // Outside the grip.`
`4784`	`4788`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2669,10 +2669,10 @@ namespace netxs::lixx // li++, libinput++.`
`2669`	`2669`	`}`
`2670`	`2670`	`}`
`2671`	`2671`	`break;`
`2672`		`- case M_VERSION: if (m->version == s->match->version) matched_flags \|= flag; break;`
`2673`		`- case M_DMI: if (::fnmatch(s->match->dmi2.data(), m->dmi2.data(), 0) == 0) matched_flags \|= flag; break;`
`2674`		`- case M_DT: if (::fnmatch(s->match->dt2.data(), m->dt2.data(), 0) == 0) matched_flags \|= flag; break;`
`2675`		`- case M_UDEV_TYPE: if (s->match->ud_type & m->ud_type) matched_flags \|= flag; break;`
	`2672`	`+ case M_VERSION: if (m->version == s->match->version) { matched_flags \|= flag; } break;`
	`2673`	`+ case M_DMI: if (::fnmatch(s->match->dmi2.data(), m->dmi2.data(), 0) == 0) { matched_flags \|= flag; } break;`
	`2674`	`+ case M_DT: if (::fnmatch(s->match->dt2.data(), m->dt2.data(), 0) == 0) { matched_flags \|= flag; } break;`
	`2675`	`+ case M_UDEV_TYPE: if (s->match->ud_type & m->ud_type) { matched_flags \|= flag; } break;`
`2676`	`2676`	`default: ::abort();`
`2677`	`2677`	`}`
`2678`	`2678`	`if (prev_matched_flags != matched_flags)`