move triangle drawing into FbDrawable

Make MenuItem triangles proportional

1 files changed, 7 insertions, 45 deletions

diff --git a/src/ArrowButton.cc b/src/ArrowButton.cc
index aa319d6..e1a2fc9 100644
--- a/src/ArrowButton.cc
+++ b/src/ArrowButton.cc
@@ -24,27 +24,27 @@
 #include "ArrowButton.hh"
 #include "ButtonTheme.hh"
 
-ArrowButton::ArrowButton(ArrowButton::Type arrow_type,
+ArrowButton::ArrowButton(FbTk::FbDrawable::TriangleType arrow_type,
                          const FbTk::FbWindow &parent,
                          int x, int y,
                          unsigned int width, unsigned int height):
     FbTk::Button(parent, x, y, width, height),
     m_arrow_type(arrow_type),
     m_mouse_handler(0),
-    m_arrowscale(300) {
+    m_arrowscale(250) {
 
     setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
                  EnterWindowMask | LeaveWindowMask);
 }
 
-ArrowButton::ArrowButton(ArrowButton::Type arrow_type,
+ArrowButton::ArrowButton(FbTk::FbDrawable::TriangleType arrow_type,
                          int screen_num,
                          int x, int y,
                          unsigned int width, unsigned int height):
     FbTk::Button(screen_num, x, y, width, height),
     m_arrow_type(arrow_type),
     m_mouse_handler(0),
-    m_arrowscale(300) {
+    m_arrowscale(250) {
 
     setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
                  EnterWindowMask | LeaveWindowMask);
@@ -84,46 +84,8 @@ void ArrowButton::leaveNotifyEvent(XCrossingEvent &ce) {
  redraws the arrow button
 */
 void ArrowButton::drawArrow() {
-    XPoint pts[3];
-    unsigned int w = width();
-    unsigned int h = height();
-
-    int arrowscale_n = m_arrowscale;
-    int arrowscale_d = 100;
-    unsigned int ax = arrowscale_d * w / arrowscale_n;
-    unsigned int ay = arrowscale_d * h / arrowscale_n;
-    // if these aren't an even number, left and right arrows end up different
-    if (( ax % 2 ) == 1) ax++;
-    if (( ay % 2 ) == 1) ay++;
-    switch (m_arrow_type) {
-    case LEFT:
-                // start at the tip
-        pts[0].x = (w / 2) - (ax / 2); pts[0].y = h / 2;
-        pts[1].x = ax; pts[1].y = -ay / 2;
-        pts[2].x = 0; pts[2].y = ay;
-        break;
-    case RIGHT:
-        pts[0].x = (w / 2) + (ax / 2); pts[0].y = h / 2;
-        pts[1].x = - ax; pts[1].y = ay / 2;
-        pts[2].x = 0; pts[2].y = - ay;
-        break;
-    case UP:
-        pts[0].x = (w / 2); pts[0].y = (h / 2) - (ay / 2);
-        pts[1].x = ax / 2; pts[1].y = ay;
-        pts[2].x = - ax; pts[2].y = 0;
-        break;
-    case DOWN:
-        pts[0].x = (w / 2); pts[0].y = (h / 2) + (ay / 2);
-        pts[1].x = ax / 2; pts[1].y = - ay;
-        pts[2].x = - ax; pts[2].y = 0;
-        break;
-    }
-
-    if (gc() != 0) {
-        fillPolygon(gc(),
-                    pts, 3, 
-                    Convex, CoordModePrevious);
-    }
+    if (gc() != 0)
+        drawTriangle(gc(), m_arrow_type, 0, 0, width(), height(), m_arrowscale);
 }
 
 void ArrowButton::updateTheme(const FbTk::Theme &theme) {
@@ -131,7 +93,7 @@ void ArrowButton::updateTheme(const FbTk::Theme &theme) {
     const ButtonTheme &btheme = static_cast<const ButtonTheme &>(theme);
 
     m_arrowscale = btheme.scale();
-    if (m_arrowscale == 0) m_arrowscale = 300; // default is 0 => 300
+    if (m_arrowscale == 0) m_arrowscale = 250; // default is 0 => 300
     else if (m_arrowscale < 100) m_arrowscale = 100; // otherwise clamp
     else if (m_arrowscale > 100000) m_arrowscale = 100000; // clamp below overflow when *100
 }