add some more variants of the cairo rounded rectangle code

git-svn-id: svn://localhost/ardour2/branches/3.0@11434 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 83 insertions, 0 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index b1a82042fa..bf9c5ff405 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -93,7 +93,14 @@ namespace Gtkmm2ext {
 
         void container_clear (Gtk::Container&);
         void rounded_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10);
+        void rounded_top_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10);
+        void rounded_top_left_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10);
+        void rounded_top_right_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r=10);
+
         void rounded_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+        void rounded_top_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+        void rounded_top_left_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+        void rounded_top_right_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
 };
 
 #endif /*  __gtkmm2ext_utils_h__ */
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index d63a94e185..7d14896438 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -390,6 +390,24 @@ Gtkmm2ext::rounded_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, d
 }
 
 void
+Gtkmm2ext::rounded_top_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r)
+{
+	rounded_top_rectangle (context->cobj(), x, y, w, h, r);
+}
+
+void
+Gtkmm2ext::rounded_top_left_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r)
+{
+	rounded_top_left_rectangle (context->cobj(), x, y, w, h, r);
+}
+
+void
+Gtkmm2ext::rounded_top_right_rectangle (Cairo::RefPtr<Cairo::Context> context, double x, double y, double w, double h, double r)
+{
+	rounded_top_right_rectangle (context->cobj(), x, y, w, h, r);
+}
+
+void
 Gtkmm2ext::rounded_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
 {
         /* renders small shapes better than most others */
@@ -411,6 +429,64 @@ Gtkmm2ext::rounded_rectangle (cairo_t* cr, double x, double y, double w, double
 	cairo_curve_to (cr, x,y,x,y,x+r,y); // Curve to A
 }
 
+void
+Gtkmm2ext::rounded_top_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
+{
+        /* renders small shapes better than most others */
+
+/*    A****BQ
+      H    C
+      *    *
+      *    *
+      F****E
+*/
+	cairo_move_to (cr, x+r,y); // Move to A
+	cairo_line_to (cr, x+w-r,y); // Straight line to B
+	cairo_curve_to (cr, x+w,y,x+w,y,x+w,y+r); // Curve to C, Control points are both at Q
+	cairo_line_to (cr, x+w,y+h); // Move to E
+	cairo_line_to (cr, x,y+h); // Line to F
+	cairo_line_to (cr, x,y+r); // Line to H
+	cairo_curve_to (cr, x,y,x,y,x+r,y); // Curve to A
+}
+
+void
+Gtkmm2ext::rounded_top_left_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
+{
+        /* renders small shapes better than most others */
+
+/*    A****B
+      H    *
+      *    *
+      *    *
+      F****E
+*/
+	cairo_move_to (cr, x+r,y); // Move to A
+	cairo_line_to (cr, x+w,y); // Straight line to B
+	cairo_line_to (cr, x+w,y+h); // Move to E
+	cairo_line_to (cr, x,y+h); // Line to F
+	cairo_line_to (cr, x,y+r); // Line to H
+	cairo_curve_to (cr, x,y,x,y,x+r,y); // Curve to A
+}
+
+void
+Gtkmm2ext::rounded_top_right_rectangle (cairo_t* cr, double x, double y, double w, double h, double r)
+{
+        /* renders small shapes better than most others */
+
+/*    A****BQ
+      *    C
+      *    *
+      *    *
+      F****E
+*/
+	cairo_move_to (cr, x+r,y); // Move to A
+	cairo_line_to (cr, x+w-r,y); // Straight line to B
+	cairo_curve_to (cr, x+w,y,x+w,y,x+w,y+r); // Curve to C, Control points are both at Q
+	cairo_line_to (cr, x+w,y+h); // Move to E
+	cairo_line_to (cr, x,y+h); // Line to F
+	cairo_line_to (cr, x,y); // Line to A
+}
+
 #else
 
 void