X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkroundedbox.c;h=653d27feefaa2008e2f0a5a1dac8171d3cfadad8;hb=ea043cab5718304d9b6170afa2d3f959fc99c718;hp=0519bfed517299332a2b74c5d3c9d78700c0ae60;hpb=34a62d779b8d1654c6de44114c35c3029bab7ec3;p=~andy%2Fgtk
diff --git a/gtk/gtkroundedbox.c b/gtk/gtkroundedbox.c
index 0519bfed5..653d27fee 100644
--- a/gtk/gtkroundedbox.c
+++ b/gtk/gtkroundedbox.c
@@ -12,15 +12,18 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
#include "config.h"
#include "gtkroundedboxprivate.h"
+#include "gtkcsscornervalueprivate.h"
+#include "gtkcsstypesprivate.h"
+#include "gtkstylecontextprivate.h"
+#include "gtkthemingengineprivate.h"
+
#include
/**
@@ -75,43 +78,70 @@ gtk_rounded_box_clamp_border_radius (GtkRoundedBox *box)
box->corner[GTK_CSS_BOTTOM_LEFT].vertical *= factor;
}
-void
-_gtk_rounded_box_apply_border_radius (GtkRoundedBox *box,
- GtkThemingEngine *engine,
- GtkStateFlags state,
- GtkJunctionSides junction)
+static void
+_gtk_rounded_box_apply_border_radius (GtkRoundedBox *box,
+ GtkCssValue **corner,
+ GtkJunctionSides junction)
{
- GtkCssBorderCornerRadius *corner[4];
- guint i;
-
- gtk_theming_engine_get (engine, state,
- /* Can't use border-radius as it's an int for
- * backwards compat */
- "border-top-left-radius", &corner[GTK_CSS_TOP_LEFT],
- "border-top-right-radius", &corner[GTK_CSS_TOP_RIGHT],
- "border-bottom-right-radius", &corner[GTK_CSS_BOTTOM_RIGHT],
- "border-bottom-left-radius", &corner[GTK_CSS_BOTTOM_LEFT],
- NULL);
-
if (corner[GTK_CSS_TOP_LEFT] && (junction & GTK_JUNCTION_CORNER_TOPLEFT) == 0)
- box->corner[GTK_CSS_TOP_LEFT] = *corner[GTK_CSS_TOP_LEFT];
+ {
+ box->corner[GTK_CSS_TOP_LEFT].horizontal = _gtk_css_corner_value_get_x (corner[GTK_CSS_TOP_LEFT],
+ box->box.width);
+ box->corner[GTK_CSS_TOP_LEFT].vertical = _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_LEFT],
+ box->box.height);
+ }
if (corner[GTK_CSS_TOP_RIGHT] && (junction & GTK_JUNCTION_CORNER_TOPRIGHT) == 0)
- box->corner[GTK_CSS_TOP_RIGHT] = *corner[GTK_CSS_TOP_RIGHT];
+ {
+ box->corner[GTK_CSS_TOP_RIGHT].horizontal = _gtk_css_corner_value_get_x (corner[GTK_CSS_TOP_RIGHT],
+ box->box.width);
+ box->corner[GTK_CSS_TOP_RIGHT].vertical = _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_RIGHT],
+ box->box.height);
+ }
if (corner[GTK_CSS_BOTTOM_RIGHT] && (junction & GTK_JUNCTION_CORNER_BOTTOMRIGHT) == 0)
- box->corner[GTK_CSS_BOTTOM_RIGHT] = *corner[GTK_CSS_BOTTOM_RIGHT];
+ {
+ box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal = _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_RIGHT],
+ box->box.width);
+ box->corner[GTK_CSS_BOTTOM_RIGHT].vertical = _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_RIGHT],
+ box->box.height);
+ }
if (corner[GTK_CSS_BOTTOM_LEFT] && (junction & GTK_JUNCTION_CORNER_BOTTOMLEFT) == 0)
- box->corner[GTK_CSS_BOTTOM_LEFT] = *corner[GTK_CSS_BOTTOM_LEFT];
+ {
+ box->corner[GTK_CSS_BOTTOM_LEFT].horizontal = _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_LEFT],
+ box->box.width);
+ box->corner[GTK_CSS_BOTTOM_LEFT].vertical = _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_LEFT],
+ box->box.height);
+ }
gtk_rounded_box_clamp_border_radius (box);
+}
+
+void
+_gtk_rounded_box_apply_border_radius_for_context (GtkRoundedBox *box,
+ GtkStyleContext *context,
+ GtkJunctionSides junction)
+{
+ GtkCssValue *corner[4];
+
+ corner[GTK_CSS_TOP_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS);
+ corner[GTK_CSS_TOP_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS);
+ corner[GTK_CSS_BOTTOM_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS);
+ corner[GTK_CSS_BOTTOM_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS);
+
+ _gtk_rounded_box_apply_border_radius (box, corner, junction);
+}
- for (i = 0; i < 4; i++)
- g_free (corner[i]);
+void
+_gtk_rounded_box_apply_border_radius_for_engine (GtkRoundedBox *box,
+ GtkThemingEngine *engine,
+ GtkJunctionSides junction)
+{
+ _gtk_rounded_box_apply_border_radius_for_context (box, _gtk_theming_engine_get_context (engine), junction);
}
static void
-gtk_css_border_radius_grow (GtkCssBorderCornerRadius *corner,
- double horizontal,
- double vertical)
+gtk_css_border_radius_grow (GtkRoundedBoxCorner *corner,
+ double horizontal,
+ double vertical)
{
corner->horizontal += horizontal;
corner->vertical += vertical;
@@ -122,6 +152,7 @@ gtk_css_border_radius_grow (GtkCssBorderCornerRadius *corner,
corner->vertical = 0;
}
}
+
void
_gtk_rounded_box_grow (GtkRoundedBox *box,
double top,
@@ -140,7 +171,7 @@ _gtk_rounded_box_grow (GtkRoundedBox *box,
box->box.width += left + right;
}
- if (box->box.height + bottom + right < 0)
+ if (box->box.height + bottom + top < 0)
{
box->box.y -= top * box->box.height / (top + bottom);
box->box.height = 0;
@@ -244,6 +275,104 @@ _gtk_rounded_box_path (const GtkRoundedBox *box,
box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
G_PI / 2, G_PI);
+
+ cairo_close_path (cr);
+}
+
+double
+_gtk_rounded_box_guess_length (const GtkRoundedBox *box,
+ GtkCssSide side)
+{
+ double length;
+ GtkCssSide before, after;
+
+ before = side;
+ after = (side + 1) % 4;
+
+ if (side & 1)
+ length = box->box.height
+ - box->corner[before].vertical
+ - box->corner[after].vertical;
+ else
+ length = box->box.width
+ - box->corner[before].horizontal
+ - box->corner[after].horizontal;
+
+ length += G_PI * 0.125 * (box->corner[before].horizontal
+ + box->corner[before].vertical
+ + box->corner[after].horizontal
+ + box->corner[after].vertical);
+
+ return length;
+}
+
+void
+_gtk_rounded_box_path_side (const GtkRoundedBox *box,
+ cairo_t *cr,
+ GtkCssSide side)
+{
+ switch (side)
+ {
+ case GTK_CSS_TOP:
+ _cairo_ellipsis (cr,
+ box->box.x + box->corner[GTK_CSS_TOP_LEFT].horizontal,
+ box->box.y + box->corner[GTK_CSS_TOP_LEFT].vertical,
+ box->corner[GTK_CSS_TOP_LEFT].horizontal,
+ box->corner[GTK_CSS_TOP_LEFT].vertical,
+ 5 * G_PI / 4, 3 * G_PI / 2);
+ _cairo_ellipsis (cr,
+ box->box.x + box->box.width - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
+ box->box.y + box->corner[GTK_CSS_TOP_RIGHT].vertical,
+ box->corner[GTK_CSS_TOP_RIGHT].horizontal,
+ box->corner[GTK_CSS_TOP_RIGHT].vertical,
+ - G_PI / 2, -G_PI / 4);
+ break;
+ case GTK_CSS_RIGHT:
+ _cairo_ellipsis (cr,
+ box->box.x + box->box.width - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
+ box->box.y + box->corner[GTK_CSS_TOP_RIGHT].vertical,
+ box->corner[GTK_CSS_TOP_RIGHT].horizontal,
+ box->corner[GTK_CSS_TOP_RIGHT].vertical,
+ - G_PI / 4, 0);
+ _cairo_ellipsis (cr,
+ box->box.x + box->box.width - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
+ box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
+ box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
+ box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
+ 0, G_PI / 4);
+ break;
+ case GTK_CSS_BOTTOM:
+ _cairo_ellipsis (cr,
+ box->box.x + box->box.width - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
+ box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
+ box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
+ box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
+ G_PI / 4, G_PI / 2);
+ _cairo_ellipsis (cr,
+ box->box.x + box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
+ box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
+ box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
+ box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
+ G_PI / 2, 3 * G_PI / 4);
+ break;
+ case GTK_CSS_LEFT:
+ _cairo_ellipsis (cr,
+ box->box.x + box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
+ box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
+ box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
+ box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
+ 3 * G_PI / 4, G_PI);
+ _cairo_ellipsis (cr,
+ box->box.x + box->corner[GTK_CSS_TOP_LEFT].horizontal,
+ box->box.y + box->corner[GTK_CSS_TOP_LEFT].vertical,
+ box->corner[GTK_CSS_TOP_LEFT].horizontal,
+ box->corner[GTK_CSS_TOP_LEFT].vertical,
+ G_PI, 5 * G_PI / 4);
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
}
void