Unico

Merge lp:~robert-ancell/unico/disable-border-radius into lp:unico

  1. disable-border-radius
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~robert-ancell/unico/disable-border-radius
Merge into: lp:unico
Diff against target: 124 lines (+19/-17)
2 files modified
unico/gtkroundedbox.c (+4/-3)
unico/unico-draw.c (+15/-14)
To merge this branch: bzr merge lp:~robert-ancell/unico/disable-border-radius
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre (community) Approve
Unico Team Pending
Review via email: mp+110231@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Guess this was landed already. Robert, can you delete the merge proposal, or mark it merged or something?

Approve since it's already shipping in quantal.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'unico/gtkroundedbox.c'
--- unico/gtkroundedbox.c 2012-02-08 12:54:39 +0000
+++ unico/gtkroundedbox.c 2012-06-14 05:34:31 +0000
@@ -90,16 +90,17 @@
90 GtkStateFlags state,90 GtkStateFlags state,
91 GtkJunctionSides junction)91 GtkJunctionSides junction)
92{92{
93 GtkCssBorderCornerRadius *corner[4];93 GtkCssBorderCornerRadius *corner[4] = { NULL, NULL, NULL, NULL };
94 guint i;94 guint i;
9595
96 /* NOTE: Border radius is disabled due to it not working in GTK+ 3.5 */
96 gtk_theming_engine_get (engine, state,97 gtk_theming_engine_get (engine, state,
97 /* Can't use border-radius as it's an int for98 /* Can't use border-radius as it's an int for
98 * backwards compat */99 * backwards compat */
99 "border-top-left-radius", &corner[GTK_CSS_TOP_LEFT],100 /*"border-top-left-radius", &corner[GTK_CSS_TOP_LEFT],
100 "border-top-right-radius", &corner[GTK_CSS_TOP_RIGHT],101 "border-top-right-radius", &corner[GTK_CSS_TOP_RIGHT],
101 "border-bottom-right-radius", &corner[GTK_CSS_BOTTOM_RIGHT],102 "border-bottom-right-radius", &corner[GTK_CSS_BOTTOM_RIGHT],
102 "border-bottom-left-radius", &corner[GTK_CSS_BOTTOM_LEFT],103 "border-bottom-left-radius", &corner[GTK_CSS_BOTTOM_LEFT],*/
103 NULL);104 NULL);
104105
105 if (corner[GTK_CSS_TOP_LEFT] && (junction & GTK_JUNCTION_CORNER_TOPLEFT) == 0)106 if (corner[GTK_CSS_TOP_LEFT] && (junction & GTK_JUNCTION_CORNER_TOPLEFT) == 0)
106107
=== modified file 'unico/unico-draw.c'
--- unico/unico-draw.c 2012-03-29 14:25:06 +0000
+++ unico/unico-draw.c 2012-06-14 05:34:31 +0000
@@ -531,8 +531,8 @@
531{531{
532 GtkBorder border;532 GtkBorder border;
533 GtkBorder *outer_border;533 GtkBorder *outer_border;
534 GtkCssBorderCornerRadius *top_left_radius, *top_right_radius;534 /*GtkCssBorderCornerRadius *top_left_radius, *top_right_radius;
535 GtkCssBorderCornerRadius *bottom_left_radius, *bottom_right_radius;535 GtkCssBorderCornerRadius *bottom_left_radius, *bottom_right_radius;*/
536 GtkJunctionSides junction;536 GtkJunctionSides junction;
537 GtkStateFlags state;537 GtkStateFlags state;
538 gboolean has_outer_stroke = FALSE;538 gboolean has_outer_stroke = FALSE;
@@ -544,13 +544,14 @@
544544
545 state = gtk_theming_engine_get_state (engine);545 state = gtk_theming_engine_get_state (engine);
546546
547 /* NOTE: Border radius is disabled due to it not working in GTK+ 3.5 */
547 gtk_theming_engine_get (engine, state,548 gtk_theming_engine_get (engine, state,
548 /* Can't use border-radius as it's an int for549 /* Can't use border-radius as it's an int for
549 * backwards compat */550 * backwards compat */
550 "border-top-left-radius", &top_left_radius,551 /*"border-top-left-radius", &top_left_radius,
551 "border-top-right-radius", &top_right_radius,552 "border-top-right-radius", &top_right_radius,
552 "border-bottom-right-radius", &bottom_right_radius,553 "border-bottom-right-radius", &bottom_right_radius,
553 "border-bottom-left-radius", &bottom_left_radius,554 "border-bottom-left-radius", &bottom_left_radius,*/
554 "-unico-outer-stroke-width", &outer_border,555 "-unico-outer-stroke-width", &outer_border,
555 NULL);556 NULL);
556 gtk_theming_engine_get_border (engine, state, &border);557 gtk_theming_engine_get_border (engine, state, &border);
@@ -575,11 +576,11 @@
575 hc += outer_border->top;576 hc += outer_border->top;
576 }577 }
577578
578 if (xy0_gap < _gtk_css_number_get (&top_left_radius->horizontal, width))579 /*if (xy0_gap < _gtk_css_number_get (&top_left_radius->horizontal, width))
579 junction |= GTK_JUNCTION_CORNER_TOPLEFT;580 junction |= GTK_JUNCTION_CORNER_TOPLEFT;
580581
581 if (xy1_gap > width - _gtk_css_number_get (&top_right_radius->horizontal, width))582 if (xy1_gap > width - _gtk_css_number_get (&top_right_radius->horizontal, width))
582 junction |= GTK_JUNCTION_CORNER_TOPRIGHT;583 junction |= GTK_JUNCTION_CORNER_TOPRIGHT;*/
583584
584 break;585 break;
585 default:586 default:
@@ -597,11 +598,11 @@
597 hc += outer_border->bottom;598 hc += outer_border->bottom;
598 }599 }
599600
600 if (xy0_gap < _gtk_css_number_get (&bottom_left_radius->horizontal, width))601 /*if (xy0_gap < _gtk_css_number_get (&bottom_left_radius->horizontal, width))
601 junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;602 junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
602603
603 if (xy1_gap > width - _gtk_css_number_get (&bottom_right_radius->horizontal, width))604 if (xy1_gap > width - _gtk_css_number_get (&bottom_right_radius->horizontal, width))
604 junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;605 junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;*/
605606
606 break;607 break;
607 case GTK_POS_LEFT:608 case GTK_POS_LEFT:
@@ -617,11 +618,11 @@
617 hc = MAX (xy1_gap - xy0_gap - (outer_border->top + outer_border->bottom) - (border.top + border.bottom), 0);618 hc = MAX (xy1_gap - xy0_gap - (outer_border->top + outer_border->bottom) - (border.top + border.bottom), 0);
618 }619 }
619620
620 if (xy0_gap < _gtk_css_number_get (&top_left_radius->vertical, height))621 /*if (xy0_gap < _gtk_css_number_get (&top_left_radius->vertical, height))
621 junction |= GTK_JUNCTION_CORNER_TOPLEFT;622 junction |= GTK_JUNCTION_CORNER_TOPLEFT;
622623
623 if (xy1_gap > height - _gtk_css_number_get (&bottom_left_radius->vertical, height))624 if (xy1_gap > height - _gtk_css_number_get (&bottom_left_radius->vertical, height))
624 junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;625 junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;*/
625626
626 break;627 break;
627 case GTK_POS_RIGHT:628 case GTK_POS_RIGHT:
@@ -638,11 +639,11 @@
638 hc = MAX (xy1_gap - xy0_gap - (outer_border->top + outer_border->bottom) - (border.top + border.bottom), 0);639 hc = MAX (xy1_gap - xy0_gap - (outer_border->top + outer_border->bottom) - (border.top + border.bottom), 0);
639 }640 }
640641
641 if (xy0_gap < _gtk_css_number_get (&top_right_radius->vertical, height))642 /*if (xy0_gap < _gtk_css_number_get (&top_right_radius->vertical, height))
642 junction |= GTK_JUNCTION_CORNER_TOPRIGHT;643 junction |= GTK_JUNCTION_CORNER_TOPRIGHT;
643644
644 if (xy1_gap > height - _gtk_css_number_get (&bottom_right_radius->vertical, height))645 if (xy1_gap > height - _gtk_css_number_get (&bottom_right_radius->vertical, height))
645 junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;646 junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;*/
646647
647 break;648 break;
648 }649 }
@@ -660,10 +661,10 @@
660661
661 cairo_restore (cr);662 cairo_restore (cr);
662663
663 g_free (top_left_radius);664 /*g_free (top_left_radius);
664 g_free (top_right_radius);665 g_free (top_right_radius);
665 g_free (bottom_right_radius);666 g_free (bottom_right_radius);
666 g_free (bottom_left_radius);667 g_free (bottom_left_radius);*/
667 gtk_border_free (outer_border);668 gtk_border_free (outer_border);
668}669}
669670

Subscribers

People subscribed via source and target branches