From 68d69bddbd6e5249b4174a6e7ba5ec91ee9cbf3e Mon Sep 17 00:00:00 2001
From: Sebastian Geerken <devnull@localhost>
Date: Mon, 28 Oct 2013 13:46:32 +0100
Subject: Made ruler widget using size hints, which fixes some problems with
 borders due to floats.

---
 dw/ruler.cc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'dw/ruler.cc')

diff --git a/dw/ruler.cc b/dw/ruler.cc
index 115dfaa5..2b5288c2 100644
--- a/dw/ruler.cc
+++ b/dw/ruler.cc
@@ -28,17 +28,28 @@ namespace dw {
 
 Ruler::Ruler ()
 {
+   setFlags (USES_HINTS);
    setFlags (BLOCK_LEVEL);
    unsetFlags (HAS_CONTENTS);
+   availWidth = 0;
 }
 
 void Ruler::sizeRequestImpl (core::Requisition *requisition)
 {
-   requisition->width = getStyle()->boxDiffWidth ();
+   requisition->width =
+      lout::misc::max (availWidth, getStyle()->boxDiffWidth ());
    requisition->ascent = getStyle()->boxOffsetY ();
    requisition->descent = getStyle()->boxRestHeight ();
 }
 
+void Ruler::setWidth (int width)
+{
+   if (availWidth != width) {
+      availWidth = width;
+      queueResize (0, false);
+   }
+}
+
 void Ruler::draw (core::View *view, core::Rectangle *area)
 {
    drawWidgetBox (view, area, false);
-- 
cgit v1.2.3