- Avoid view.refresh(ctx.bounds). It does not respect scaling and other canvas transformations. It's just view.refresh(ctx).

djowel · djowel · commit b0d4bce399f2 · 2024-01-25T11:00:32.000+08:00
- Add a new view.refresh(ctx, bounds) that DO respect scaling and other canvas transformations.
- Deal linux refesh(rect). GTK uses int coordinates. Make sure area is not empty when converting from float to int.
diff --git a/examples/custom_control/main.cpp b/examples/custom_control/main.cpp
@@ -164,7 +164,7 @@ void my_custom_control::keep_tracking(context const& ctx, tracker_info& track_in
    clamp(_radius, 50, 150);
    if (on_change)
       on_change(_radius);
-   ctx.view.refresh(ctx.bounds);
+   ctx.view.refresh(ctx);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -177,7 +177,7 @@ bool my_custom_control::cursor(context const& ctx, point p, cursor_tracking stat
       case cursor_tracking::hovering:
       case cursor_tracking::entering:
          _mouse_over = true;
-         ctx.view.refresh(ctx.bounds);
+         ctx.view.refresh(ctx);
          break;
       case cursor_tracking::leaving:
          _mouse_over = false;
diff --git a/lib/host/gtk3/base_view.cpp b/lib/host/gtk3/base_view.cpp
@@ -751,11 +751,13 @@ namespace cycfi { namespace elements
       GtkAllocation alloc;
       gtk_widget_get_allocation(_view->_widget, &alloc);
 
+      // Note: GTK uses int coordinates. Make sure area is not empty when converting
+      // from float to int.
       gtk_widget_queue_draw_area(_view->_widget,
-         area.left + alloc.x,
-         area.top + alloc.y,
-         area.width(),
-         area.height()
+         std::floor(area.left + alloc.x),
+         std::floor(area.top + alloc.y),
+         std::max<float>(area.width(), 1),
+         std::max<float>(area.height(), 1)
       );
    }
 
diff --git a/lib/include/elements/element/gallery/thumbwheel.hpp b/lib/include/elements/element/gallery/thumbwheel.hpp
@@ -41,7 +41,7 @@ namespace cycfi { namespace elements
 
       float                quantize() const { return _quantize; }
       void                 make_aligner(context const& ctx);
-      void                 do_align(view& view_, rect const& bounds, double val);
+      void                 do_align(view& view_, double val);
 
    private:
 
diff --git a/lib/include/elements/view.hpp b/lib/include/elements/view.hpp
@@ -55,6 +55,7 @@ namespace cycfi { namespace elements
 
       void                    refresh() override;
       void                    refresh(rect area) override;
+      void                    refresh(context const& ctx, rect area);
       void                    refresh(element& element, int outward = 0);
       void                    refresh(context const& ctx, int outward = 0);
       rect                    dirty() const;
diff --git a/lib/src/element/drag_and_drop.cpp b/lib/src/element/drag_and_drop.cpp
@@ -52,7 +52,7 @@ namespace cycfi { namespace elements
       if (new_is_tracking != _is_tracking)
       {
          _is_tracking = new_is_tracking;
-         ctx.view.refresh(ctx.bounds);
+         ctx.view.refresh(ctx);
       }
    }
 
@@ -84,7 +84,7 @@ namespace cycfi { namespace elements
    {
       base_type::drop(ctx, info);
       bool r = on_drop(info);
-      ctx.view.refresh(ctx.bounds);
+      ctx.view.refresh(ctx);
       return r;
    }
 
@@ -143,7 +143,7 @@ namespace cycfi { namespace elements
          static constexpr auto offset = 20;
          rect r = {info.where.x-offset, info.where.y-offset, info.where.x+offset, info.where.y+offset};
          scrollable::find(ctx).scroll_into_view(r);
-         ctx.view.refresh(ctx.bounds);
+         ctx.view.refresh(ctx);
       }
    }
 
@@ -153,7 +153,7 @@ namespace cycfi { namespace elements
       if (_insertion_pos >= 0)
       {
          bool r = on_drop(info, _insertion_pos);
-         ctx.view.refresh(ctx.bounds);
+         ctx.view.refresh(ctx);
          _insertion_pos = -1;
          return r;
       }
diff --git a/lib/src/element/gallery/thumbwheel.cpp b/lib/src/element/gallery/thumbwheel.cpp
@@ -24,32 +24,32 @@ namespace cycfi { namespace elements
       if (_quantize > 0)
       {
          _aligner =
-            [this, &view = ctx.view, bounds = ctx.bounds](double val)
+            [this, &view = ctx.view](double val)
             {
                view.post(
-                  [this, &view, val, bounds]()
+                  [this, &view, val]()
                   {
-                     do_align(view, bounds, val);
+                     do_align(view, val);
                   }
                );
             };
       }
    }
 
-   void basic_thumbwheel_element::do_align(view& view_, rect const& bounds, double val)
+   void basic_thumbwheel_element::do_align(view& view_, double val)
    {
       auto curr = align();
       auto diff = val - curr;
       if (std::abs(diff) < (_quantize / 10))
       {
          align(val);
          if (diff > 0)
-            view_.refresh(bounds);
+            view_.refresh(*dynamic_cast<element*>(this));
       }
       else
       {
          align(curr + diff/10);
-         view_.refresh(bounds);
+         view_.refresh(*dynamic_cast<element*>(this));
       }
    }
 
diff --git a/lib/src/element/selection.cpp b/lib/src/element/selection.cpp
@@ -279,7 +279,7 @@ namespace cycfi::elements
                }
                if (r && _select_start >= 0)
                {
-                  ctx.view.refresh(ctx.bounds);
+                  ctx.view.refresh(ctx);
                   on_select(_select_start, _select_end);
                }
             }
@@ -301,7 +301,7 @@ namespace cycfi::elements
                   if (auto c = find_subject<composite_base*>(this))
                   {
                      detail::select_all(*c);
-                     ctx.view.refresh(ctx.bounds);
+                     ctx.view.refresh(ctx);
                      return true;
                   }
                }
@@ -326,7 +326,7 @@ namespace cycfi::elements
                         [&](context const& cctx)
                         {
                            scrollable::find(ctx).scroll_into_view(c->bounds_of(cctx, _select_end));
-                           ctx.view.refresh(ctx.bounds);
+                           ctx.view.refresh(ctx);
                         }
                      );
                      r = true;
@@ -354,7 +354,7 @@ namespace cycfi::elements
                         [&](context const& cctx)
                         {
                            scrollable::find(ctx).scroll_into_view(c->bounds_of(cctx, _select_end));
-                           ctx.view.refresh(ctx.bounds);
+                           ctx.view.refresh(ctx);
                         }
                      );
                      r = true;
diff --git a/lib/src/element/text.cpp b/lib/src/element/text.cpp
@@ -57,9 +57,9 @@ namespace cycfi { namespace elements
       if (_current_size.x != new_x || _current_size.y != new_y)
       {
          if (_current_size.x != -1 && _current_size.y != -1)
-            ctx.view.refresh(union_(ctx.bounds, rect(ctx.bounds.top_left(), extent{_current_size})));
+            ctx.view.refresh(ctx, union_(ctx.bounds, rect(ctx.bounds.top_left(), extent{_current_size})));
          else
-            ctx.view.refresh(ctx.bounds);
+            ctx.view.refresh(ctx);
       }
 
       _current_size.x = new_x;
@@ -564,7 +564,7 @@ namespace cycfi { namespace elements
          auto size = current_size();
          bounds.width(size.x);
          bounds.height(size.y);
-         ctx.view.refresh(bounds);
+         ctx.view.refresh(ctx, bounds);
       }
 
       if (handled)
@@ -631,9 +631,11 @@ namespace cycfi { namespace elements
 
       if (_is_focus && has_caret && !_caret_started)
       {
+         // We convert the caret bounds to device coordinates and expand it by 2 pixels
+         // on all sides for good measure.
          auto tl = ctx.canvas.user_to_device(caret_bounds.top_left());
          auto br = ctx.canvas.user_to_device(caret_bounds.bottom_right());
-         caret_bounds = {tl.x, tl.y, br.x, br.y};
+         caret_bounds = {tl.x-2, tl.y-2, br.x+2, br.y+2};
 
          _caret_started = true;
          ctx.view.post(500ms,
diff --git a/lib/src/view.cpp b/lib/src/view.cpp
@@ -160,6 +160,13 @@ namespace cycfi { namespace elements
       );
    }
 
+   void view::refresh(context const& ctx, rect area)
+   {
+      auto tl = ctx.canvas.user_to_device(area.top_left());
+      auto br = ctx.canvas.user_to_device(area.bottom_right());
+      refresh({tl.x, tl.y, br.x, br.y});
+   }
+
    void view::refresh(element& element, int outward)
    {
       if (_current_bounds.is_empty())

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ namespace cycfi { namespace elements`
`52`	`52`	`if (new_is_tracking != _is_tracking)`
`53`	`53`	`{`
`54`	`54`	`_is_tracking = new_is_tracking;`
`55`		`- ctx.view.refresh(ctx.bounds);`
	`55`	`+ ctx.view.refresh(ctx);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`@@ -84,7 +84,7 @@ namespace cycfi { namespace elements`
`84`	`84`	`{`
`85`	`85`	`base_type::drop(ctx, info);`
`86`	`86`	`bool r = on_drop(info);`
`87`		`- ctx.view.refresh(ctx.bounds);`
	`87`	`+ ctx.view.refresh(ctx);`
`88`	`88`	`return r;`
`89`	`89`	`}`
`90`	`90`
`@@ -143,7 +143,7 @@ namespace cycfi { namespace elements`
`143`	`143`	`static constexpr auto offset = 20;`
`144`	`144`	`rect r = {info.where.x-offset, info.where.y-offset, info.where.x+offset, info.where.y+offset};`
`145`	`145`	`scrollable::find(ctx).scroll_into_view(r);`
`146`		`- ctx.view.refresh(ctx.bounds);`
	`146`	`+ ctx.view.refresh(ctx);`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`@@ -153,7 +153,7 @@ namespace cycfi { namespace elements`
`153`	`153`	`if (_insertion_pos >= 0)`
`154`	`154`	`{`
`155`	`155`	`bool r = on_drop(info, _insertion_pos);`
`156`		`- ctx.view.refresh(ctx.bounds);`
	`156`	`+ ctx.view.refresh(ctx);`
`157`	`157`	`_insertion_pos = -1;`
`158`	`158`	`return r;`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,32 +24,32 @@ namespace cycfi { namespace elements`
`24`	`24`	`if (_quantize > 0)`
`25`	`25`	`{`
`26`	`26`	`_aligner =`
`27`		`- [this, &view = ctx.view, bounds = ctx.bounds](double val)`
	`27`	`+ [this, &view = ctx.view](double val)`
`28`	`28`	`{`
`29`	`29`	`view.post(`
`30`		`- [this, &view, val, bounds]()`
	`30`	`+ [this, &view, val]()`
`31`	`31`	`{`
`32`		`- do_align(view, bounds, val);`
	`32`	`+ do_align(view, val);`
`33`	`33`	`}`
`34`	`34`	`);`
`35`	`35`	`};`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- void basic_thumbwheel_element::do_align(view& view_, rect const& bounds, double val)`
	`39`	`+ void basic_thumbwheel_element::do_align(view& view_, double val)`
`40`	`40`	`{`
`41`	`41`	`auto curr = align();`
`42`	`42`	`auto diff = val - curr;`
`43`	`43`	`if (std::abs(diff) < (_quantize / 10))`
`44`	`44`	`{`
`45`	`45`	`align(val);`
`46`	`46`	`if (diff > 0)`
`47`		`- view_.refresh(bounds);`
	`47`	`+ view_.refresh(dynamic_cast<element>(this));`
`48`	`48`	`}`
`49`	`49`	`else`
`50`	`50`	`{`
`51`	`51`	`align(curr + diff/10);`
`52`		`- view_.refresh(bounds);`
	`52`	`+ view_.refresh(dynamic_cast<element>(this));`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ namespace cycfi::elements`
`279`	`279`	`}`
`280`	`280`	`if (r && _select_start >= 0)`
`281`	`281`	`{`
`282`		`- ctx.view.refresh(ctx.bounds);`
	`282`	`+ ctx.view.refresh(ctx);`
`283`	`283`	`on_select(_select_start, _select_end);`
`284`	`284`	`}`
`285`	`285`	`}`
`@@ -301,7 +301,7 @@ namespace cycfi::elements`
`301`	`301`	`if (auto c = find_subject<composite_base*>(this))`
`302`	`302`	`{`
`303`	`303`	`detail::select_all(*c);`
`304`		`- ctx.view.refresh(ctx.bounds);`
	`304`	`+ ctx.view.refresh(ctx);`
`305`	`305`	`return true;`
`306`	`306`	`}`
`307`	`307`	`}`
`@@ -326,7 +326,7 @@ namespace cycfi::elements`
`326`	`326`	`[&](context const& cctx)`
`327`	`327`	`{`
`328`	`328`	`scrollable::find(ctx).scroll_into_view(c->bounds_of(cctx, _select_end));`
`329`		`- ctx.view.refresh(ctx.bounds);`
	`329`	`+ ctx.view.refresh(ctx);`
`330`	`330`	`}`
`331`	`331`	`);`
`332`	`332`	`r = true;`
`@@ -354,7 +354,7 @@ namespace cycfi::elements`
`354`	`354`	`[&](context const& cctx)`
`355`	`355`	`{`
`356`	`356`	`scrollable::find(ctx).scroll_into_view(c->bounds_of(cctx, _select_end));`
`357`		`- ctx.view.refresh(ctx.bounds);`
	`357`	`+ ctx.view.refresh(ctx);`
`358`	`358`	`}`
`359`	`359`	`);`
`360`	`360`	`r = true;`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,13 @@ namespace cycfi { namespace elements`
`160`	`160`	`);`
`161`	`161`	`}`
`162`	`162`
	`163`	`+ void view::refresh(context const& ctx, rect area)`
	`164`	`+ {`
	`165`	`+ auto tl = ctx.canvas.user_to_device(area.top_left());`
	`166`	`+ auto br = ctx.canvas.user_to_device(area.bottom_right());`
	`167`	`+ refresh({tl.x, tl.y, br.x, br.y});`
	`168`	`+ }`
	`169`	`+`
`163`	`170`	`void view::refresh(element& element, int outward)`
`164`	`171`	`{`
`165`	`172`	`if (_current_bounds.is_empty())`