[Xfce4-commits] gtk-xfce-engine:peter/refresh Use parent style for retrieving the background.
Updating branch refs/heads/peter/refresh to 8c34d1b897fd622b8dc52234030ece763c33f142 (commit) from 4d040a1e3b6a82c86399819261944b88d93b99ea (commit) commit 8c34d1b897fd622b8dc52234030ece763c33f142 Author: Peter de Ridder pe...@xfce.org Date: Thu Jan 9 22:11:32 2014 +0100 Use parent style for retrieving the background. gtk-2.0/xfce_theme_draw.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index b1eff5b..4226d25 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -400,7 +400,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state /* Get the background color from the parent widget. * This makes a nicer corner if the background colors differ. */ -pstyle = gtk_widget_get_style(widget); +pstyle = gtk_widget_get_style(parent); pbg = pstyle-bg[gtk_widget_get_state(parent)]; } else ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/refresh Use parent background for smooth edges.
Updating branch refs/heads/peter/refresh to e91f7cd0cfa190a3e71f246793dd4a7cae9953d0 (commit) from 8358551451918f61947dbd9e0066ee8a08b51149 (commit) commit e91f7cd0cfa190a3e71f246793dd4a7cae9953d0 Author: Peter de Ridder pe...@xfce.org Date: Sun Jan 5 14:00:38 2014 +0100 Use parent background for smooth edges. gtk-2.0/xfce_theme_draw.c | 28 +--- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 1e0c0db..f2a4abd 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -383,6 +383,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state { gint xt, yt; cairo_t *cr; +GtkWidget *parent; +GtkStyle *pstyle; +GdkColor *pbg; CHECK_ARGS; @@ -391,6 +394,17 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state SANITIZE_SIZE; +parent = gtk_widget_get_parent(widget); +if (parent) +{ +pstyle = gtk_widget_get_style(widget); +pbg = pstyle-bg[gtk_widget_get_state(parent)]; +} +else +{ +pbg = style-mid[state_type]; +} + /* Spin buttons are a special case */ if (widget GTK_IS_SPIN_BUTTON (widget)) { @@ -465,7 +479,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state state_type = GTK_STATE_NORMAL; } -gdk_cairo_set_source_color(cr, style-mid[state_type]); +gdk_cairo_set_source_color(cr, pbg); cairo_rectangle(cr, x, y, 1, 1); cairo_rectangle(cr, x + width - 1, y, 1, 1); cairo_rectangle(cr, x, y + height - 1, 1, 1); @@ -559,7 +573,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height - 1); cairo_stroke(cr); -gdk_cairo_set_source_color(cr, style-mid[GTK_STATE_NORMAL]); +gdk_cairo_set_source_color(cr, pbg); cairo_rectangle(cr, x, y, 1, 1); cairo_rectangle(cr, x + width - 1, y, 1, 1); cairo_rectangle(cr, x, y + height - 1, 1, 1); @@ -592,7 +606,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_line_to(cr, x + width - 1.5, y + 2.5); cairo_stroke(cr); -gdk_cairo_set_source_color(cr, style-mid[state_type]); +gdk_cairo_set_source_color(cr, pbg); cairo_rectangle(cr, x, y, 1, 1); cairo_rectangle(cr, x + width - 1, y, 1, 1); cairo_rectangle(cr, x, y + height - 1, 1, 1); @@ -614,7 +628,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_line_to(cr, x + width - 0.5, y + 1.5); cairo_stroke(cr); -gdk_cairo_set_source_color(cr, style-mid[state_type]); +gdk_cairo_set_source_color(cr, pbg); cairo_rectangle(cr, x, y, 1, 1); cairo_rectangle(cr, x + width - 1, y, 1, 1); cairo_rectangle(cr, x, y + height - 1, 1, 1); @@ -685,7 +699,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height - 1); cairo_stroke(cr); -gdk_cairo_set_source_color(cr, style-mid[GTK_STATE_NORMAL]); +gdk_cairo_set_source_color(cr, pbg); cairo_rectangle(cr, x, y, 1, 1); cairo_rectangle(cr, x + width - 1, y, 1, 1); cairo_rectangle(cr, x, y + height - 1, 1, 1); @@ -865,7 +879,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_line_to(cr, x + width - 1.5, y + 1.5); cairo_stroke(cr); -gdk_cairo_set_source_color(cr, style-mid[state_type]); +gdk_cairo_set_source_color(cr, pbg); cairo_rectangle(cr, x, y, 1, 1); cairo_rectangle(cr, x + width - 1, y, 1, 1); cairo_rectangle(cr, x, y + height - 1, 1, 1); @@ -887,7 +901,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_line_to(cr, x + width - 0.5, y + 1.5); cairo_stroke(cr); -gdk_cairo_set_source_color(cr
[Xfce4-commits] gtk-xfce-engine:peter/refresh Improved Gtk2 notebook.
Updating branch refs/heads/peter/refresh to 4d040a1e3b6a82c86399819261944b88d93b99ea (commit) from ae2622e6917da359ab2868443bc399dff76774d5 (commit) commit 4d040a1e3b6a82c86399819261944b88d93b99ea Author: Peter de Ridder pe...@xfce.org Date: Sun Jan 5 16:16:22 2014 +0100 Improved Gtk2 notebook. gtk-2.0/xfce_theme_draw.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 3c5070e..b1eff5b 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -397,6 +397,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state parent = gtk_widget_get_parent(widget); if (parent) { +/* Get the background color from the parent widget. + * This makes a nicer corner if the background colors differ. + */ pstyle = gtk_widget_get_style(widget); pbg = pstyle-bg[gtk_widget_get_state(parent)]; } @@ -1322,14 +1325,14 @@ static void draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType stat cairo_stroke(cr); gdk_cairo_set_source_color(cr, c2); -cairo_move_to(cr, x + 1.5, y + 1.5); +cairo_move_to(cr, x + 1.5, y + 0.5); cairo_line_to(cr, x + 1.5, y + height - 1.5); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c3); cairo_move_to(cr, x + 2.5, y + height - 1.5); cairo_line_to(cr, x + width - 1.5, y + height - 1.5); -cairo_line_to(cr, x + width - 0.5, y + 0.5); +cairo_line_to(cr, x + width - 1.5, y + 0.5); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c4); @@ -1351,10 +1354,9 @@ static void draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType stat cairo_line_to(cr, x + gap_x, y + 1.5); cairo_stroke(cr); -cairo_rectangle(cr, x + gap_x, y + 0.5, 1, 1); -cairo_move_to(cr, x + gap_x, y); +cairo_move_to(cr, x + gap_x, y + 0.5); cairo_line_to(cr, x + gap_x + 1, y + 0.5); -cairo_fill(cr); +cairo_stroke(cr); } if ((width - (gap_x + gap_width)) 0) { @@ -1554,8 +1556,6 @@ static void draw_extension(GtkStyle * style, GdkWindow * window, GtkStateType st CHECK_ARGS; SANITIZE_SIZE; -gtk_style_apply_default_background(style, window, widget !GTK_WIDGET_NO_WINDOW(widget), state_type, area, x, y, width, height); - if (XFCE_RC_STYLE(style-rc_style)-smooth_edge) { c1 = style-dark[state_type]; @@ -1591,7 +1591,7 @@ static void draw_extension(GtkStyle * style, GdkWindow * window, GtkStateType st cairo_stroke(cr); gdk_cairo_set_source_color(cr, c2); -cairo_move_to(cr, x + 1.5, y + 1.5); +cairo_move_to(cr, x + 1.5, y + 0.5); cairo_line_to(cr, x + 1.5, y + height - 1.5); cairo_stroke(cr); @@ -1643,7 +1643,7 @@ static void draw_extension(GtkStyle * style, GdkWindow * window, GtkStateType st cairo_stroke(cr); gdk_cairo_set_source_color(cr, c2); -cairo_move_to(cr, x + 1.5, y + 1.5); +cairo_move_to(cr, x + 0.5, y + 1.5); cairo_line_to(cr, x + width - 1.5, y + 1.5); cairo_stroke(cr); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/refresh Use smooth_edge in focus line too.
Updating branch refs/heads/peter/refresh to ae2622e6917da359ab2868443bc399dff76774d5 (commit) from e91f7cd0cfa190a3e71f246793dd4a7cae9953d0 (commit) commit ae2622e6917da359ab2868443bc399dff76774d5 Author: Peter de Ridder pe...@xfce.org Date: Sun Jan 5 15:19:00 2014 +0100 Use smooth_edge in focus line too. gtk-2.0/xfce_theme_draw.c | 63 +++-- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index f2a4abd..3c5070e 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -1776,14 +1776,21 @@ static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType state_ total_length += dash_list[i]; } -/* The dash offset here aligns the pattern to integer pixels - * by starting the dash at the right side of the left border - * Negative dash offsets in cairo don't work - * (https://bugs.freedesktop.org/show_bug.cgi?id=2729) - */ -dash_offset = - line_width / 2.; -while (dash_offset 0) -dash_offset += total_length; +if (XFCE_RC_STYLE(style-rc_style)-smooth_edge) +{ + dash_offset = 0; +} +else +{ +/* The dash offset here aligns the pattern to integer pixels + * by starting the dash at the right side of the left border + * Negative dash offsets in cairo don't work + * (https://bugs.freedesktop.org/show_bug.cgi?id=2729) + */ +dash_offset = - line_width / 2.; +while (dash_offset 0) +dash_offset += total_length; +} cairo_set_dash (cr, dashes, n_dashes, dash_offset); g_free (dashes); @@ -1795,11 +1802,41 @@ static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType state_ cairo_clip (cr); } -cairo_rectangle (cr, -x + line_width / 2., -y + line_width / 2., -width - line_width, -height - line_width); +if (XFCE_RC_STYLE(style-rc_style)-smooth_edge) +{ +cairo_move_to (cr, +x + 1, +y + line_width / 2.); +cairo_line_to (cr, +x + width - 1, +y + line_width / 2.); +cairo_move_to (cr, +x + width - line_width / 2., +y + 1); +cairo_line_to (cr, +x + width - line_width / 2., +y + height - 1); +cairo_move_to (cr, +x + width - 1, +y + height - line_width / 2.); +cairo_line_to (cr, +x + 1, +y + height - line_width / 2.); +cairo_move_to (cr, +x + line_width / 2., +y + height - 1); +cairo_line_to (cr, +x + line_width / 2., +y + 1); +} +else +{ +cairo_rectangle (cr, +x + line_width / 2., +y + line_width / 2., +width - line_width, +height - line_width); +} cairo_stroke (cr); cairo_destroy (cr); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/refresh Added focus_color style property.
Updating branch refs/heads/peter/refresh to 8358551451918f61947dbd9e0066ee8a08b51149 (commit) from 32dce2c571c45b1da25b4b6116e6e13d5d95a76e (commit) commit 8358551451918f61947dbd9e0066ee8a08b51149 Author: Peter de Ridder pe...@xfce.org Date: Fri Dec 27 13:52:17 2013 +0100 Added focus_color style property. gtk-2.0/xfce_rc_style.c | 32 + gtk-2.0/xfce_rc_style.h | 10 ++ gtk-2.0/xfce_theme_draw.c | 88 + 3 files changed, 130 insertions(+) diff --git a/gtk-2.0/xfce_rc_style.c b/gtk-2.0/xfce_rc_style.c index a732b69..5e36230 100644 --- a/gtk-2.0/xfce_rc_style.c +++ b/gtk-2.0/xfce_rc_style.c @@ -78,6 +78,7 @@ theme_symbols[] = { shade_start, TOKEN_SHADE_START }, { shade_end, TOKEN_SHADE_END }, { flat_border, TOKEN_FLATBORDER }, +{ focus_color, TOKEN_FOCUSCOLOR }, { true, TOKEN_TRUE}, { TRUE, TOKEN_TRUE}, { false, TOKEN_FALSE}, @@ -111,6 +112,7 @@ void xfce_rc_style_register_type(GTypeModule * module) static void xfce_rc_style_init(XfceRcStyle * style) { +style-flags = XFCE_RC_FLAGS_NONE; style-smooth_edge = FALSE; style-grip_style = XFCE_RC_GRIP_ROUGH; style-gradient = FALSE; @@ -375,6 +377,24 @@ static guint theme_parse_grip_style (GScanner * scanner, GTokenType wanted_token return G_TOKEN_NONE; } +static guint theme_parse_color (GScanner *scanner, GTokenType wanted_token, GtkRcStyle *style, GdkColor *retval) +{ +guint token; + +token = g_scanner_get_next_token (scanner); +if (token != wanted_token) +{ +return wanted_token; +} +token = g_scanner_get_next_token (scanner); +if (token != G_TOKEN_EQUAL_SIGN) +{ +return G_TOKEN_EQUAL_SIGN; +} + +return gtk_rc_parse_color_full (scanner, style, retval); +} + static guint xfce_rc_style_parse(GtkRcStyle * rc_style, GtkSettings * settings, GScanner * scanner) { static GQuark scope_id = 0; @@ -383,6 +403,7 @@ static guint xfce_rc_style_parse(GtkRcStyle * rc_style, GtkSettings * settings, guint token; guint i; gboolean b; +GdkColor c; /* Set up a new scope in this scanner. */ if(!scope_id) @@ -432,6 +453,15 @@ static guint xfce_rc_style_parse(GtkRcStyle * rc_style, GtkSettings * settings, } theme_data-flat_border = b; break; +case TOKEN_FOCUSCOLOR: +token = theme_parse_color (scanner, TOKEN_FOCUSCOLOR, rc_style, c); +if(token != G_TOKEN_NONE) +{ +break; +} +theme_data-focus_color = c; +theme_data-flags |= XFCE_RC_FOCUS_COLOR; +break; default: g_scanner_get_next_token(scanner); token = G_TOKEN_RIGHT_CURLY; @@ -464,6 +494,7 @@ static void xfce_rc_style_merge(GtkRcStyle * dest, GtkRcStyle * src) src_data = XFCE_RC_STYLE(src); dest_data = XFCE_RC_STYLE(dest); +dest_data-flags = src_data-flags; dest_data-smooth_edge = src_data-smooth_edge; dest_data-grip_style = src_data-grip_style; dest_data-gradient = src_data-gradient; @@ -471,6 +502,7 @@ static void xfce_rc_style_merge(GtkRcStyle * dest, GtkRcStyle * src) dest_data-shade_start = src_data-shade_start; dest_data-shade_end = src_data-shade_end; dest_data-flat_border = src_data-flat_border; +dest_data-focus_color = src_data-focus_color; } /* Create an empty style suitable to this RC style diff --git a/gtk-2.0/xfce_rc_style.h b/gtk-2.0/xfce_rc_style.h index c2c94e1..0b8d609 100644 --- a/gtk-2.0/xfce_rc_style.h +++ b/gtk-2.0/xfce_rc_style.h @@ -71,10 +71,18 @@ typedef enum XFCE_RC_GRIP_SLIDE } XfceRcHandlerType; +typedef enum +{ +XFCE_RC_FLAGS_NONE = 0, +XFCE_RC_FOCUS_COLOR = 10 +} XfceRcFlags; + struct _XfceRcStyle { GtkRcStyle parent_instance; +XfceRcFlags flags; + gboolean smooth_edge; XfceRcHandlerType grip_style; gboolean gradient; @@ -82,6 +90,7 @@ struct _XfceRcStyle gfloat shade_start; gfloat shade_end; gboolean flat_border; +GdkColor focus_color; }; struct _XfceRcStyleClass @@ -111,6 +120,7 @@ enum TOKEN_SHADE_START, TOKEN_SHADE_END, TOKEN_FLATBORDER, +TOKEN_FOCUSCOLOR, TOKEN_TRUE, TOKEN_FALSE }; diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index a50c692..1e0c0db 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -1706,6 +1706,93 @@ static void draw_handle(GtkStyle * style, GdkWindow * window, GtkStateType state xfce_draw_grips(style, window, state_type, area, widget, x, y, width, height, orientation); } +static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint x, gint y, gint width, gint height) +{ +cairo_t *cr
[Xfce4-commits] gtk-xfce-engine:peter/refresh Creating branch peter/refresh
Updating branch refs/heads/peter/refresh as new branch to 32dce2c571c45b1da25b4b6116e6e13d5d95a76e (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/peter/refresh for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/refresh Support trough-side-details.
Updating branch refs/heads/peter/refresh to 8318ef51418fcf6d5707e6951dc1af7beab5e231 (commit) from 7474743ceb1b9e066868517c8f98da033094d129 (commit) commit 8318ef51418fcf6d5707e6951dc1af7beab5e231 Author: Peter de Ridder pe...@xfce.org Date: Sun Dec 15 19:44:52 2013 +0100 Support trough-side-details. gtk-2.0/xfce_theme_draw.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 6181356..3b1ea9a 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -107,6 +107,11 @@ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateT cr = ge_gdk_drawable_to_cairo(window, area); +if (DETAIL(trough-lower)) +{ +state_type = GTK_STATE_SELECTED; +} + if ((!draw_base) (XFCE_RC_STYLE(style-rc_style)-gradient)) { switch (XFCE_RC_STYLE(style-rc_style)-gradient_style) @@ -143,7 +148,7 @@ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateT } break; } -if ((state_type == GTK_STATE_ACTIVE) || (DETAIL(trough))) +if ((state_type == GTK_STATE_ACTIVE) || (DETAIL(trough)) || (DETAIL(trough-lower)) || (DETAIL(trough-upper))) { shade_start = MIN (XFCE_RC_STYLE(style-rc_style)-shade_start, XFCE_RC_STYLE(style-rc_style)-shade_end); shade_end = MAX (XFCE_RC_STYLE(style-rc_style)-shade_start, XFCE_RC_STYLE(style-rc_style)-shade_end); @@ -493,9 +498,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state case GTK_SHADOW_IN: if (XFCE_RC_STYLE(style-rc_style)-smooth_edge) { -if (DETAIL(trough)) +if (DETAIL(trough) || DETAIL(trough-lower) || DETAIL(trough-upper)) { -gdk_cairo_set_source_color(cr, style-bg[GTK_STATE_NORMAL]); +gdk_cairo_set_source_color(cr, style-bg[DETAIL(trough-lower) ? GTK_STATE_SELECTED : GTK_STATE_NORMAL]); cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height - 1); cairo_stroke(cr); @@ -564,9 +569,9 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state } else { -if (DETAIL(trough)) +if (DETAIL(trough) || DETAIL(trough-lower) || DETAIL(trough-upper)) { -gdk_cairo_set_source_color(cr, style-dark[GTK_STATE_ACTIVE]); +gdk_cairo_set_source_color(cr, style-dark[DETAIL(trough-lower) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE]); cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height - 1); cairo_stroke(cr); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/refresh Added flat_border style property.
Updating branch refs/heads/peter/refresh to 32dce2c571c45b1da25b4b6116e6e13d5d95a76e (commit) from 5f5e546e368772d64c9855a038026eb81156af98 (commit) commit 32dce2c571c45b1da25b4b6116e6e13d5d95a76e Author: Peter de Ridder pe...@xfce.org Date: Sun Dec 15 22:03:51 2013 +0100 Added flat_border style property. gtk-2.0/xfce_rc_style.c | 11 + gtk-2.0/xfce_rc_style.h |2 + gtk-2.0/xfce_theme_draw.c | 788 - 3 files changed, 435 insertions(+), 366 deletions(-) diff --git a/gtk-2.0/xfce_rc_style.c b/gtk-2.0/xfce_rc_style.c index 99db22c..a732b69 100644 --- a/gtk-2.0/xfce_rc_style.c +++ b/gtk-2.0/xfce_rc_style.c @@ -77,6 +77,7 @@ theme_symbols[] = { southern_diagonal, TOKEN_SOUTHERN_DIAGONAL }, { shade_start, TOKEN_SHADE_START }, { shade_end, TOKEN_SHADE_END }, +{ flat_border, TOKEN_FLATBORDER }, { true, TOKEN_TRUE}, { TRUE, TOKEN_TRUE}, { false, TOKEN_FALSE}, @@ -116,6 +117,7 @@ static void xfce_rc_style_init(XfceRcStyle * style) style-gradient_style = XFCE_RC_GRADIENT_AUTO; style-shade_start = DEFAULT_SHADE_START; style-shade_end = DEFAULT_SHADE_END; +style-flat_border = FALSE; } static void xfce_rc_style_class_init(XfceRcStyleClass * klass) @@ -422,6 +424,14 @@ static guint xfce_rc_style_parse(GtkRcStyle * rc_style, GtkSettings * settings, break; } break; +case TOKEN_FLATBORDER: +token = theme_parse_boolean(scanner, TOKEN_FLATBORDER, b); +if(token != G_TOKEN_NONE) +{ +break; +} +theme_data-flat_border = b; +break; default: g_scanner_get_next_token(scanner); token = G_TOKEN_RIGHT_CURLY; @@ -460,6 +470,7 @@ static void xfce_rc_style_merge(GtkRcStyle * dest, GtkRcStyle * src) dest_data-gradient_style = src_data-gradient_style; dest_data-shade_start = src_data-shade_start; dest_data-shade_end = src_data-shade_end; +dest_data-flat_border = src_data-flat_border; } /* Create an empty style suitable to this RC style diff --git a/gtk-2.0/xfce_rc_style.h b/gtk-2.0/xfce_rc_style.h index 53566b6..c2c94e1 100644 --- a/gtk-2.0/xfce_rc_style.h +++ b/gtk-2.0/xfce_rc_style.h @@ -81,6 +81,7 @@ struct _XfceRcStyle XfceRcGradientType gradient_style; gfloat shade_start; gfloat shade_end; +gboolean flat_border; }; struct _XfceRcStyleClass @@ -109,6 +110,7 @@ enum TOKEN_SOUTHERN_DIAGONAL, TOKEN_SHADE_START, TOKEN_SHADE_END, +TOKEN_FLATBORDER, TOKEN_TRUE, TOKEN_FALSE }; diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 576cb36..a50c692 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -423,345 +423,234 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state xt = MIN(style-xthickness, width - 1); yt = MIN(style-ythickness, height - 1); -switch (shadow_type) +if (XFCE_RC_STYLE(style-rc_style)-flat_border) { -case GTK_SHADOW_NONE: -break; -case GTK_SHADOW_ETCHED_IN: -if ((xt 1) (yt 1)) +if ((DETAIL(spinbutton_up) || DETAIL(spinbutton_down)) (state_type != GTK_STATE_PRELIGHT state_type != GTK_STATE_ACTIVE)) +{ +/* Do nothing */ +} +else if (DETAIL(menubar) || DETAIL (handlebox_bin) || DETAIL (handlebox) || DETAIL (toolbar)) +{ +if (yt 0) { -gdk_cairo_set_source_color(cr, style-light[state_type]); +gdk_cairo_set_source_color(cr, style-dark[state_type]); cairo_move_to(cr, x + 0.5, y + height - 0.5); cairo_line_to(cr, x + width - 0.5, y + height - 0.5); -cairo_line_to(cr, x + width - 0.5, y + 0.5); -cairo_stroke(cr); - -gdk_cairo_set_source_color(cr, style-dark[state_type]); -cairo_move_to(cr, x + width - 1.5, y + 0.5); -cairo_line_to(cr, x + 0.5, y + 0.5); -cairo_line_to(cr, x + 0.5, y + height - 1.5); -cairo_stroke(cr); - -gdk_cairo_set_source_color(cr, style-light[state_type]); -cairo_move_to(cr, x + width - 1.5, y + 1.5); -cairo_line_to(cr, x + 1.5, y + 1.5); -cairo_line_to(cr, x + 1.5, y + height - 1.5); -cairo_stroke(cr); - -gdk_cairo_set_source_color(cr, style-dark[state_type]); -cairo_move_to(cr, x + 1.5, y + height - 1.5); -cairo_line_to(cr, x + width - 1.5, y + height - 1.5); -cairo_line_to(cr, x + width - 1.5, y + 1.5); cairo_stroke(cr); } -else if ((xt 0) (yt 0)) +} +else
[Xfce4-commits] gtk-xfce-engine:peter/refresh More consistent notebook in Gtk2.
Updating branch refs/heads/peter/refresh to 5f5e546e368772d64c9855a038026eb81156af98 (commit) from 8318ef51418fcf6d5707e6951dc1af7beab5e231 (commit) commit 5f5e546e368772d64c9855a038026eb81156af98 Author: Peter de Ridder pe...@xfce.org Date: Sun Dec 15 19:46:17 2013 +0100 More consistent notebook in Gtk2. gtk-2.0/xfce_theme_draw.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 3b1ea9a..576cb36 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -1259,13 +1259,13 @@ static void draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType stat gdk_cairo_set_source_color(cr, c3); cairo_move_to(cr, x + 2.5, y + height - 1.5); cairo_line_to(cr, x + width - 1.5, y + height - 1.5); -cairo_line_to(cr, x + width - 1.5, y + 0.5); +cairo_line_to(cr, x + width - 0.5, y + 0.5); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c4); cairo_move_to(cr, x + 1.5, y + height - 0.5); cairo_line_to(cr, x + width - 0.5, y + height - 0.5); -cairo_line_to(cr, x + width - 0.5, y + 0.5); +cairo_line_to(cr, x + width - 0.5, y + 1.5); cairo_stroke(cr); cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT); @@ -1290,7 +1290,7 @@ static void draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType stat { gdk_cairo_set_source_color(cr, c1); cairo_move_to(cr, x + gap_x + gap_width, y + 0.5); -cairo_line_to(cr, x + width - 1, y + 0.5); +cairo_line_to(cr, x + width, y + 0.5); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c2); @@ -1316,12 +1316,12 @@ static void draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType stat cairo_stroke(cr); gdk_cairo_set_source_color(cr, c3); -cairo_move_to(cr, x + width - 1.5, y + 1.5); +cairo_move_to(cr, x + width - 1.5, y + 2.5); cairo_line_to(cr, x + width - 1.5, y + height - 0.5); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c4); -cairo_move_to(cr, x + width - 0.5, y + 0.5); +cairo_move_to(cr, x + width - 0.5, y + 1.5); cairo_line_to(cr, x + width - 0.5, y + height - 0.5); cairo_stroke(cr); @@ -1329,12 +1329,12 @@ static void draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType stat if (gap_x 0) { gdk_cairo_set_source_color(cr, c4); -cairo_move_to(cr, x, y + height - 0.5); +cairo_move_to(cr, x + 1, y + height - 0.5); cairo_line_to(cr, x + gap_x, y + height - 0.5); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c3); -cairo_move_to(cr, x + 1, y + height - 1.5); +cairo_move_to(cr, x + 2, y + height - 1.5); cairo_line_to(cr, x + gap_x, y + height - 1.5); cairo_move_to(cr, x + gap_x, y + height - 0.5); @@ -1371,25 +1371,25 @@ static void draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType stat gdk_cairo_set_source_color(cr, c3); cairo_move_to(cr, x + 0.5, y + height - 1.5); cairo_line_to(cr, x + width - 1.5, y + height - 1.5); -cairo_line_to(cr, x + width - 1.5, y + 1.5); +cairo_line_to(cr, x + width - 1.5, y + 2.5); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c4); cairo_move_to(cr, x + 1.5, y + height - 0.5); cairo_line_to(cr, x + width - 0.5, y + height - 0.5); -cairo_line_to(cr, x + width - 0.5, y + 0.5); +cairo_line_to(cr, x + width - 0.5, y + 1.5); cairo_stroke(cr); cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT); if (gap_x 0) { gdk_cairo_set_source_color(cr, c1); -cairo_move_to(cr, x + 0.5, y); +cairo_move_to(cr, x + 0.5, y + 1); cairo_line_to(cr, x + 0.5, y + gap_x); cairo_stroke(cr); gdk_cairo_set_source_color(cr, c2); -cairo_move_to(cr, x + 1.5, y + 1
[Xfce4-commits] squeeze:stephan/new-ui Fixed syntax and Makefile errors.
Updating branch refs/heads/stephan/new-ui to ba043fde27e263fa3bfb159f88447cd9fdc7c691 (commit) from 5618f356820490d680416df05800b9fb00950b9b (commit) commit ba043fde27e263fa3bfb159f88447cd9fdc7c691 Author: Peter de Ridder pe...@xfce.org Date: Thu Jun 20 22:14:44 2013 +0200 Fixed syntax and Makefile errors. configure.ac.in |2 ++ src/Makefile.am |5 - src/archive_store.c |2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index cce8d3e..88b2ea4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -159,6 +159,8 @@ libsqueeze/Makefile squeeze-cli/Makefile icons/Makefile icons/16x16/Makefile +icons/22x22/Makefile +icons/32x32/Makefile icons/48x48/Makefile icons/scalable/Makefile pixmaps/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 43be2d0..1878f93 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,13 +32,16 @@ squeeze_LDFLAGS = \ INCLUDES = \ -I${top_srcdir} +EXTRA_DIST= \ + main_window_ui.h + if MAINTAINER_MODE DISTCLEANFILES = \ throbber-fallback.c BUILT_SOURCES = \ - throbber-fallback.c + throbber-fallback.c \ main_window_ui.h throbber-fallback.c: $(srcdir)/throbber-fallback.png Makefile diff --git a/src/archive_store.c b/src/archive_store.c index 8a14310..f38979a 100644 --- a/src/archive_store.c +++ b/src/archive_store.c @@ -43,7 +43,7 @@ sq_archive_store_dispose(GObject *object); /* properties */ enum { - SQ_ARCHIVE_STORE_SHOW_ICONS = 1 + SQ_ARCHIVE_STORE_SHOW_ICONS = 1, SQ_ARCHIVE_STORE_SORT_FOLDERS_FIRST, SQ_ARCHIVE_STORE_SORT_CASE_SENSITIVE }; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 Added panel class for theming.
Updating branch refs/heads/nick/gtk3 to 2820b5bc195adfc49490d9001f8f4e8677140203 (commit) from 8b0b96ddd9d4debe3823675b53eb1425256a37ec (commit) commit 2820b5bc195adfc49490d9001f8f4e8677140203 Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 21 14:13:16 2013 +0200 Added panel class for theming. panel/panel-base-window.c |6 ++ wrapper/wrapper-plug.c| 11 +-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c index e4039eb..f39a1c2 100644 --- a/panel/panel-base-window.c +++ b/panel/panel-base-window.c @@ -196,6 +196,8 @@ panel_base_window_class_init (PanelBaseWindowClass *klass) static void panel_base_window_init (PanelBaseWindow *window) { + GtkStyleContext *context; + window-priv = G_TYPE_INSTANCE_GET_PRIVATE (window, PANEL_TYPE_BASE_WINDOW, PanelBaseWindowPrivate); window-is_composited = FALSE; @@ -216,6 +218,10 @@ panel_base_window_init (PanelBaseWindow *window) /* set colormap */ panel_base_window_screen_changed (GTK_WIDGET (window), NULL); + + /* set the panel class */ + context = gtk_widget_get_style_context (GTK_WIDGET (window)); + gtk_style_context_add_class (context, panel); } diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c index d00784e..de08e8c 100644 --- a/wrapper/wrapper-plug.c +++ b/wrapper/wrapper-plug.c @@ -91,8 +91,9 @@ static void wrapper_plug_init (WrapperPlug *plug) { #if GTK_CHECK_VERSION (3, 0, 0) - GdkVisual *visual = NULL; - GdkScreen *screen; + GdkVisual *visual = NULL; + GdkScreen *screen; + GtkStyleContext *context; #else GdkColormap *colormap = NULL; GdkScreen *screen; @@ -119,6 +120,12 @@ wrapper_plug_init (WrapperPlug *plug) if (colormap != NULL) gtk_widget_set_colormap (GTK_WIDGET (plug), colormap); #endif + +#if GTK_CHECK_VERSION (3, 0, 0) + /* set the panel class */ + context = gtk_widget_get_style_context (GTK_WIDGET (plug)); + gtk_style_context_add_class (context, panel); +#endif } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 Changed systray to use message filtering.
Updating branch refs/heads/nick/gtk3 to 83b7df032eceb5ad4266611effd98663f8eda55d (commit) from e8ca9eea79ee65068edc43b8fc4b2236833de8c8 (commit) commit 83b7df032eceb5ad4266611effd98663f8eda55d Author: Peter de Ridder pe...@xfce.org Date: Tue Apr 16 19:59:27 2013 +0200 Changed systray to use message filtering. plugins/systray/systray-manager.c | 35 ++- 1 files changed, 14 insertions(+), 21 deletions(-) diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c index 7402b70..ac820eb 100644 --- a/plugins/systray/systray-manager.c +++ b/plugins/systray/systray-manager.c @@ -118,6 +118,9 @@ struct _SystrayManager /* _net_system_tray_opcode atom */ Atomopcode_atom; + /* _net_system_tray_message_data atom */ + Atomdata_atom; + /* _net_system_tray_s%d atom */ GdkAtom selection_atom; }; @@ -307,6 +310,7 @@ systray_manager_register (SystrayManager *manager, GtkWidget *invisible; guint32 timestamp; GdkAtom opcode_atom; + GdkAtom data_atom; XClientMessageEvent xevent; Window root_window; @@ -372,7 +376,7 @@ systray_manager_register (SystrayManager *manager, XSendEvent (GDK_DISPLAY_XDISPLAY (display), root_window, False, StructureNotifyMask, (XEvent *)xevent); - /* system_tray_request_dock and selectionclear */ + /* system_tray_request_dock, system_tray_begin_message, system_tray_cancel_message and selectionclear */ gdk_window_add_filter (gtk_widget_get_window (GTK_WIDGET (invisible)), systray_manager_window_filter, manager); @@ -380,16 +384,8 @@ systray_manager_register (SystrayManager *manager, opcode_atom = gdk_atom_intern (_NET_SYSTEM_TRAY_OPCODE, FALSE); manager-opcode_atom = gdk_x11_atom_to_xatom_for_display (display, opcode_atom); - /* system_tray_begin_message and system_tray_cancel_message */ - // FIXME - //gdk_display_add_client_message_filter (display, - //opcode_atom, systray_manager_handle_client_message_opcode, manager); - - /* _net_system_tray_message_data */ - // FIXME - //gdk_display_add_client_message_filter (display, - //gdk_atom_intern (_NET_SYSTEM_TRAY_MESSAGE_DATA, FALSE), - //systray_manager_handle_client_message_message_data, manager); + data_atom = gdk_atom_intern (_NET_SYSTEM_TRAY_MESSAGE_DATA, FALSE); + manager-data_atom = gdk_x11_atom_to_xatom_for_display (display, data_atom); panel_debug (PANEL_DEBUG_SYSTRAY, registered manager on screen %d, screen_number); } @@ -491,14 +487,11 @@ systray_manager_window_filter (GdkXEvent *xev, if (xevent-type == ClientMessage) { - if (xevent-xclient.message_type == manager-opcode_atom - xevent-xclient.data.l[1] == XFCE_SYSTRAY_MANAGER_REQUEST_DOCK) -{ - /* dock a tray icon */ - systray_manager_handle_dock_request (manager, (XClientMessageEvent *) xevent); + if (xevent-xclient.message_type == manager-opcode_atom) +return systray_manager_handle_client_message_opcode (xevent, event, user_data); - return GDK_FILTER_REMOVE; -} + if (xevent-xclient.message_type == manager-data_atom) +return systray_manager_handle_client_message_message_data (xevent, event, user_data); } else if (xevent-type == SelectionClear) { @@ -530,8 +523,8 @@ systray_manager_handle_client_message_opcode (GdkXEvent *xevent, switch (xev-data.l[1]) { case XFCE_SYSTRAY_MANAGER_REQUEST_DOCK: -/* handled in systray_manager_window_filter () */ -break; +systray_manager_handle_dock_request (manager, xev); +return GDK_FILTER_REMOVE; case XFCE_SYSTRAY_MANAGER_BEGIN_MESSAGE: systray_manager_handle_begin_message (manager, xev); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 Changed systray to use visuals.
Updating branch refs/heads/nick/gtk3 to a3b73cb278a0ff2d2f939edd5aa9b53860b2812c (commit) from 83b7df032eceb5ad4266611effd98663f8eda55d (commit) commit a3b73cb278a0ff2d2f939edd5aa9b53860b2812c Author: Peter de Ridder pe...@xfce.org Date: Tue Apr 16 20:28:22 2013 +0200 Changed systray to use visuals. plugins/systray/systray-socket.c | 50 +++-- 1 files changed, 15 insertions(+), 35 deletions(-) diff --git a/plugins/systray/systray-socket.c b/plugins/systray/systray-socket.c index 18dcc0d..6188774 100644 --- a/plugins/systray/systray-socket.c +++ b/plugins/systray/systray-socket.c @@ -136,14 +136,13 @@ systray_socket_realize (GtkWidget *widget) socket-parent_relative_bg = FALSE; } - // FIXME - //else if (gtk_widget_get_visual (widget) == - // gdk_drawable_get_visual (GDK_DRAWABLE (gdk_window_get_parent (window - // { - //gdk_window_set_back_pixmap (window, NULL, TRUE); - // - //socket-parent_relative_bg = TRUE; - // } + else if (gtk_widget_get_visual (widget) == + gdk_window_get_visual (gdk_window_get_parent (window))) +{ + gdk_window_set_background_pattern (window, NULL); + + socket-parent_relative_bg = TRUE; +} else { socket-parent_relative_bg = FALSE; @@ -246,8 +245,7 @@ systray_socket_new (GdkScreen *screen, XWindowAttributes attr; gint result; GdkVisual *visual; - //GdkColormap *colormap; //FIXME - //gboolean release_colormap = FALSE; + gint red_prec, green_prec, blue_prec; panel_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); @@ -267,37 +265,19 @@ systray_socket_new (GdkScreen *screen, if (G_UNLIKELY (visual == NULL)) return NULL; - /* get the correct colormap */ - // FIXME - //if (visual == gdk_screen_get_rgb_visual (screen)) - // colormap = gdk_screen_get_rgb_colormap (screen); - //else if (visual == gdk_screen_get_rgba_visual (screen)) - // colormap = gdk_screen_get_rgba_colormap (screen); - //else if (visual == gdk_screen_get_system_visual (screen)) - // colormap = gdk_screen_get_system_colormap (screen); - //else - // { - ///* create custom colormap */ - //colormap = gdk_colormap_new (visual, FALSE); - //release_colormap = TRUE; - // } - /* create a new socket */ socket = g_object_new (XFCE_TYPE_SYSTRAY_SOCKET, NULL); socket-window = window; socket-is_composited = FALSE; - //gtk_widget_set_colormap (GTK_WIDGET (socket), colormap); //FIXME - - /* release the custom colormap */ - // FIXME - //if (release_colormap) - // g_object_unref (G_OBJECT (colormap)); + gtk_widget_set_visual (GTK_WIDGET (socket), visual); /* check if there is an alpha channel in the visual */ - // FIXME - //if (visual-red_prec + visual-blue_prec + visual-green_prec visual-depth - // gdk_display_supports_composite (gdk_screen_get_display (screen))) - // socket-is_composited = TRUE; + gdk_visual_get_red_pixel_details (visual, NULL, NULL, red_prec); + gdk_visual_get_green_pixel_details (visual, NULL, NULL, green_prec); + gdk_visual_get_blue_pixel_details (visual, NULL, NULL, blue_prec); + if (red_prec + blue_prec + green_prec gdk_visual_get_depth (visual) + gdk_display_supports_composite (gdk_screen_get_display (screen))) +socket-is_composited = TRUE; return GTK_WIDGET (socket); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 Loading external gtk2 panel plugins in gtk3 panel.
Updating branch refs/heads/nick/gtk3 to e75149caaa8ce162f8ec260543b9f698220ec961 (commit) from 3ad863389f96b218ff286c922b091473b8cda1b6 (commit) commit e75149caaa8ce162f8ec260543b9f698220ec961 Author: Andrzej ndrwr...@gmail.com Date: Sun Apr 7 22:49:33 2013 +0100 Loading external gtk2 panel plugins in gtk3 panel. Addeding X-XFCE-API to the plugin .desktop files to determine which wrapper to use. This falls back to 1.0 wrapper for compatibility with the current plugins. configure.ac.in| 12 ++ libxfce4panel/libxfce4panel-1.0.pc.in |1 + libxfce4panel/libxfce4panel-2.0.pc.in |1 + panel/panel-module.c | 22 +++- panel/panel-module.h |2 + panel/panel-plugin-external-wrapper.c |2 +- plugins/actions/Makefile.am|4 +- .../{actions.desktop.in = actions.desktop.in.in} |1 + plugins/applicationsmenu/Makefile.am |4 +- ...u.desktop.in = applicationsmenu.desktop.in.in} |1 + plugins/clock/Makefile.am |4 +- .../{clock.desktop.in = clock.desktop.in.in} |1 + plugins/directorymenu/Makefile.am |4 +- ...menu.desktop.in = directorymenu.desktop.in.in} |1 + plugins/launcher/Makefile.am |4 +- ...{launcher.desktop.in = launcher.desktop.in.in} |1 + plugins/pager/Makefile.am |4 +- .../{pager.desktop.in = pager.desktop.in.in} |1 + plugins/separator/Makefile.am |4 +- ...eparator.desktop.in = separator.desktop.in.in} |1 + plugins/showdesktop/Makefile.am|4 +- ...esktop.desktop.in = showdesktop.desktop.in.in} |1 + plugins/systray/Makefile.am|4 +- .../{systray.desktop.in = systray.desktop.in.in} |1 + plugins/tasklist/Makefile.am |4 +- ...{tasklist.desktop.in = tasklist.desktop.in.in} |1 + plugins/windowmenu/Makefile.am |4 +- ...dowmenu.desktop.in = windowmenu.desktop.in.in} |1 + 28 files changed, 71 insertions(+), 24 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index d3291ad..ccd30b0 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -91,6 +91,7 @@ LIBXFCE4PANEL_VERSION_API=libxfce4panel_version_api() LIBXFCE4PANEL_VERSION_MAJOR=xfce4_panel_version_major() LIBXFCE4PANEL_VERSION_MINOR=xfce4_panel_version_minor() LIBXFCE4PANEL_VERSION_MICRO=xfce4_panel_version_micro() +AC_DEFINE([LIBXFCE4PANEL_VERSION_API], libxfce4panel_version_api(), [libxfce4panel api version]) AC_SUBST([LIBXFCE4PANEL_VERSION]) AC_SUBST([LIBXFCE4PANEL_VERSION_API]) AC_SUBST([LIBXFCE4PANEL_VERSION_MAJOR]) @@ -243,16 +244,27 @@ panel/Makefile wrapper/Makefile plugins/Makefile plugins/actions/Makefile +plugins/actions/actions.desktop.in plugins/applicationsmenu/Makefile +plugins/applicationsmenu/applicationsmenu.desktop.in plugins/clock/Makefile +plugins/clock/clock.desktop.in plugins/directorymenu/Makefile +plugins/directorymenu/directorymenu.desktop.in plugins/launcher/Makefile +plugins/launcher/launcher.desktop.in plugins/pager/Makefile +plugins/pager/pager.desktop.in plugins/separator/Makefile +plugins/separator/separator.desktop.in plugins/showdesktop/Makefile +plugins/showdesktop/showdesktop.desktop.in plugins/systray/Makefile +plugins/systray/systray.desktop.in plugins/tasklist/Makefile +plugins/tasklist/tasklist.desktop.in plugins/windowmenu/Makefile +plugins/windowmenu/windowmenu.desktop.in po/Makefile.in ]) diff --git a/libxfce4panel/libxfce4panel-1.0.pc.in b/libxfce4panel/libxfce4panel-1.0.pc.in index d30feda..90423b6 100644 --- a/libxfce4panel/libxfce4panel-1.0.pc.in +++ b/libxfce4panel/libxfce4panel-1.0.pc.in @@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ localedir=@localedir@ +api=1.0 Name: libxfce4panel Description: Library for the Xfce Panel diff --git a/libxfce4panel/libxfce4panel-2.0.pc.in b/libxfce4panel/libxfce4panel-2.0.pc.in index 1358023..4f18f0f 100644 --- a/libxfce4panel/libxfce4panel-2.0.pc.in +++ b/libxfce4panel/libxfce4panel-2.0.pc.in @@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ localedir=@localedir@ +api=@LIBXFCE4PANEL_VERSION_API@ Name: libxfce4panel Description: Library for the Xfce Panel diff --git a/panel/panel-module.c b/panel/panel-module.c index 2c29f03..48d9745 100644 --- a/panel/panel-module.c +++ b/panel/panel-module.c @@ -100,6 +100,9 @@ struct _PanelModule /* for gobject plugins */ GTypeplugin_type; + + /* for wrapper plugins */ + gchar *api; }; @@ -144,6 +147,7 @@ panel_module_init (PanelModule *module) module-library = NULL; module-construct_func = NULL; module-plugin_type =
[Xfce4-commits] xfce4-panel:nick/gtk3 gdk_threads_enter()/_leave() deprecation.
Updating branch refs/heads/nick/gtk3 to 61166c26b393f94872fc6ad86fd13ff8fccb99d3 (commit) from e9c0da4a9fdf6b9fb9dd7cd9eb79432f7a935604 (commit) commit 61166c26b393f94872fc6ad86fd13ff8fccb99d3 Author: Peter de Ridder pe...@xfce.org Date: Tue Apr 9 20:34:42 2013 +0200 gdk_threads_enter()/_leave() deprecation. panel/panel-application.c |6 ++ panel/panel-base-window.c |4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/panel/panel-application.c b/panel/panel-application.c index bd19f1c..a883a80 100644 --- a/panel/panel-application.c +++ b/panel/panel-application.c @@ -505,9 +505,7 @@ panel_application_wait_for_window_manager_destroyed (gpointer data) /* start loading the panels, hopefully a window manager is found, but it * probably also works fine without... */ - GDK_THREADS_ENTER (); panel_application_load_real (application); - GDK_THREADS_LEAVE (); } #endif @@ -1216,8 +1214,8 @@ panel_application_load (PanelApplication *application, /* setup timeout to check for a window manager */ application-wait_for_wm_timeout_id = - g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, 50, panel_application_wait_for_window_manager, - wfwm, panel_application_wait_for_window_manager_destroyed); + gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE, 50, panel_application_wait_for_window_manager, +wfwm, panel_application_wait_for_window_manager_destroyed); } else { diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c index 24a0801..e4039eb 100644 --- a/panel/panel-base-window.c +++ b/panel/panel-base-window.c @@ -403,7 +403,7 @@ panel_base_window_set_property (GObject *object, if (priv-active_timeout_id == 0) { /* start timeout for the marching ants selection */ - priv-active_timeout_id = g_timeout_add_seconds_full ( + priv-active_timeout_id = gdk_threads_add_timeout_seconds_full ( G_PRIORITY_DEFAULT_IDLE, 1, panel_base_window_active_timeout, object, panel_base_window_active_timeout_destroyed); @@ -731,9 +731,7 @@ static gboolean panel_base_window_active_timeout (gpointer user_data) { /* redraw to update marching ants */ - GDK_THREADS_ENTER (); gtk_widget_queue_draw (GTK_WIDGET (user_data)); - GDK_THREADS_LEAVE (); return TRUE; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 gdk global pointer deprication/
Updating branch refs/heads/nick/gtk3 to a0fa189b715401eb0a206bc2215bab7b4ae53b18 (commit) from 61166c26b393f94872fc6ad86fd13ff8fccb99d3 (commit) commit a0fa189b715401eb0a206bc2215bab7b4ae53b18 Author: Peter de Ridder pe...@xfce.org Date: Tue Apr 9 20:35:54 2013 +0200 gdk global pointer deprication/ panel/panel-window.c | 31 +++ 1 files changed, 11 insertions(+), 20 deletions(-) diff --git a/panel/panel-window.c b/panel/panel-window.c index 339e1c7..62c912f 100644 --- a/panel/panel-window.c +++ b/panel/panel-window.c @@ -949,8 +949,8 @@ panel_window_motion_notify_event (GtkWidget *widget, * the panel that is currently dragged */ if (event-x == 0 event-y == 0) { - gdk_display_get_pointer (gtk_widget_get_display (widget), - screen, NULL, NULL, NULL); + gdk_device_get_position (event-device, + screen, NULL, NULL); if (screen != gtk_window_get_screen (GTK_WINDOW (window))) { gtk_window_set_screen (GTK_WINDOW (window), screen); @@ -1033,12 +1033,13 @@ panel_window_button_press_event (GtkWidget *widget, cursor = gdk_cursor_new_for_display (display, GDK_FLEUR); /* grab the pointer for dragging the window */ - status = gdk_pointer_grab (event-window, FALSE, - GDK_BUTTON_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK, - NULL, cursor, event-time); + status = gdk_device_grab (event-device, event-window, +GDK_OWNERSHIP_NONE, FALSE, +GDK_BUTTON_MOTION_MASK +| GDK_BUTTON_RELEASE_MASK, +cursor, event-time); - gdk_cursor_unref (cursor); + g_object_unref (cursor); /* set the grab info if the grab was successfully made */ if (G_LIKELY (status == GDK_GRAB_SUCCESS)) @@ -1072,15 +1073,13 @@ panel_window_button_release_event (GtkWidget *widget, GdkEventButton *event) { PanelWindow *window = PANEL_WINDOW (widget); - GdkDisplay *display; panel_return_val_if_fail (PANEL_IS_WINDOW (window), FALSE); if (window-grab_time != 0) { /* ungrab the pointer */ - display = gdk_screen_get_display (window-screen); - gdk_display_pointer_ungrab (display, window-grab_time); + gdk_device_ungrab (event-device, window-grab_time); window-grab_time = 0; /* store the new position */ @@ -1106,8 +1105,6 @@ panel_window_grab_notify (GtkWidget *widget, { PanelWindow *window = PANEL_WINDOW (widget); GtkWidget *current; - GdkScreen *screen; - gint x, y; current = gtk_grab_get_current (); if (GTK_IS_MENU_SHELL (current)) @@ -1125,16 +1122,10 @@ panel_window_grab_notify (GtkWidget *widget, { if (current != NULL) { - gdk_display_get_pointer (gtk_widget_get_display (current), - screen, x, y, NULL); - /* filter out grab event that did not occur in the panel window, * but in a windows that is part of this process */ - if (gtk_window_get_screen (GTK_WINDOW (window)) != screen - || x window-alloc.x - || x window-alloc.x + window-alloc.width - || y window-alloc.y - || y window-alloc.y + window-alloc.height) + if (gtk_widget_get_toplevel (GTK_WIDGET (window)) != + gtk_widget_get_toplevel (current)) { /* block the next notification */ window-autohide_grab_block++; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 Use gtk_selection_data_...() functions.
Updating branch refs/heads/nick/gtk3 to 132029185b6c70bebbee84d905ce4e635594d1f4 (commit) from a0fa189b715401eb0a206bc2215bab7b4ae53b18 (commit) commit 132029185b6c70bebbee84d905ce4e635594d1f4 Author: Peter de Ridder pe...@xfce.org Date: Tue Apr 9 20:42:49 2013 +0200 Use gtk_selection_data_...() functions. panel/panel-application.c |6 +++--- panel/panel-item-dialog.c |2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panel/panel-application.c b/panel/panel-application.c index a883a80..4235b6f 100644 --- a/panel/panel-application.c +++ b/panel/panel-application.c @@ -522,7 +522,7 @@ panel_application_plugin_move_drag_data_get (GtkWidget *item, /* set some data, we never use this, but GTK_DEST_DEFAULT_ALL * used in the item dialog requires this */ gtk_selection_data_set (selection_data, - selection_data-target, 8, + gtk_selection_data_get_target (selection_data), 8, (const guchar *) 0, 1); } @@ -902,10 +902,10 @@ panel_application_drag_data_received (PanelWindow *window, switch (info) { case TARGET_PLUGIN_NAME: - if (G_LIKELY (selection_data-length 0)) + if (G_LIKELY (gtk_selection_data_get_length (selection_data) 0)) { /* create a new item with a unique id */ - name = (const gchar *) selection_data-data; + name = (const gchar *) gtk_selection_data_get_data (selection_data); succeed = panel_application_plugin_insert (application, window, name, -1, NULL, application-drop_index); } diff --git a/panel/panel-item-dialog.c b/panel/panel-item-dialog.c index 6ecb8b1..648dbb6 100644 --- a/panel/panel-item-dialog.c +++ b/panel/panel-item-dialog.c @@ -542,7 +542,7 @@ panel_item_dialog_drag_data_get (GtkWidget*treeview, { /* set the internal module name as selection data */ internal_name = panel_module_get_name (module); - gtk_selection_data_set (selection_data, selection_data-target, 8, + gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), 8, (guchar *) internal_name, strlen (internal_name)); g_object_unref (G_OBJECT (module)); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 Ported client event to raw X
Updating branch refs/heads/nick/gtk3 to e9c0da4a9fdf6b9fb9dd7cd9eb79432f7a935604 (commit) from 50657c1a3f0bf0a3720a47b5366dac79087e488f (commit) commit e9c0da4a9fdf6b9fb9dd7cd9eb79432f7a935604 Author: Peter de Ridder pe...@xfce.org Date: Mon Apr 8 21:39:20 2013 +0200 Ported client event to raw X panel/panel-plugin-external-46.c | 124 ++ 1 files changed, 85 insertions(+), 39 deletions(-) diff --git a/panel/panel-plugin-external-46.c b/panel/panel-plugin-external-46.c index ca2a2e0..c115486 100644 --- a/panel/panel-plugin-external-46.c +++ b/panel/panel-plugin-external-46.c @@ -48,17 +48,20 @@ -static void panel_plugin_external_46_finalize (GObject *object); -static gboolean panel_plugin_external_46_client_event (GtkWidget *widget, - GdkEventClient *event); -static gchar**panel_plugin_external_46_get_argv (PanelPluginExternal *external, - gchar **arguments); -static void panel_plugin_external_46_set_properties (PanelPluginExternal *external, - GSList *properties); -static gboolean panel_plugin_external_46_remote_event (PanelPluginExternal *external, - const gchar *name, - const GValue *value, - guint *handle); +static void panel_plugin_external_46_finalize (GObject *object); +static void panel_plugin_external_46_realize(GtkWidget *widget); +static void panel_plugin_external_46_unrealize (GtkWidget *widget); +static GdkFilterReturn panel_plugin_external_46_event_filter (GdkXEvent *xevent, + GdkEvent *event, + gpointer data); +static gchar **panel_plugin_external_46_get_argv (PanelPluginExternal *external, + gchar **arguments); +static void panel_plugin_external_46_set_properties (PanelPluginExternal *external, + GSList *properties); +static gboolean panel_plugin_external_46_remote_event (PanelPluginExternal *external, + const gchar *name, + const GValue *value, + guint *handle); @@ -76,7 +79,7 @@ struct _PanelPluginExternal46 -static GdkAtom panel_atom = GDK_NONE; +static Atom panel_atom = None; @@ -95,14 +98,15 @@ panel_plugin_external_46_class_init (PanelPluginExternal46Class *klass) gobject_class-finalize = panel_plugin_external_46_finalize; gtkwidget_class = GTK_WIDGET_CLASS (klass); - gtkwidget_class-client_event = panel_plugin_external_46_client_event; + gtkwidget_class-realize = panel_plugin_external_46_realize; + gtkwidget_class-unrealize = panel_plugin_external_46_unrealize; plugin_external_class = PANEL_PLUGIN_EXTERNAL_CLASS (klass); plugin_external_class-get_argv = panel_plugin_external_46_get_argv; plugin_external_class-set_properties = panel_plugin_external_46_set_properties; plugin_external_class-remote_event = panel_plugin_external_46_remote_event; - panel_atom = gdk_atom_intern_static_string (_PANEL_CLIENT_EVENT_ATOM); + panel_atom = XInternAtom( gdk_x11_get_default_xdisplay (), _PANEL_CLIENT_EVENT_ATOM, False); } @@ -127,16 +131,55 @@ panel_plugin_external_46_finalize (GObject *object) -static gboolean -panel_plugin_external_46_client_event (GtkWidget *widget, - GdkEventClient *event) +static void +panel_plugin_external_46_realize (GtkWidget *widget) +{ + GdkWindow *window; + + GTK_WIDGET_CLASS (panel_plugin_external_46_parent_class)-realize (widget); + + window = gtk_widget_get_window (widget); + if (G_UNLIKELY (window == NULL)) +return; + + gdk_window_add_filter (window, panel_plugin_external_46_event_filter, widget); +} + + + +static void +panel_plugin_external_46_unrealize (GtkWidget *widget) { - PanelPluginExternal *external = PANEL_PLUGIN_EXTERNAL (widget); + GdkWindow *window; + + window = gtk_widget_get_window (widget); + if (G_LIKELY (window != NULL)) +{ + gdk_window_remove_filter (window
[Xfce4-commits] xfce4-panel:nick/gtk3 Made wrapper versioning parallel to libxfce4panel.
Updating branch refs/heads/nick/gtk3 to 5b61215ff6495ab260aa9f69cf4c8f1178c62325 (commit) from 4266d3766f4e0222391967e034e1d396ae16b5a2 (commit) commit 5b61215ff6495ab260aa9f69cf4c8f1178c62325 Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 7 22:45:36 2013 +0200 Made wrapper versioning parallel to libxfce4panel. wrapper/Makefile.am | 24 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am index 86abda1..fa56540 100644 --- a/wrapper/Makefile.am +++ b/wrapper/Makefile.am @@ -8,12 +8,12 @@ AM_CPPFLAGS = \ wrapperdir = $(HELPER_PATH_PREFIX)/xfce4/panel wrapper_PROGRAMS = \ - wrapper3 + wrapper-2.0 wrapper_built_sources = \ wrapper-dbus-client-infos.h -wrapper3_SOURCES = \ +wrapper_2_0_SOURCES = \ $(wrapper_built_sources) \ main.c \ wrapper-module.c \ @@ -21,25 +21,25 @@ wrapper3_SOURCES = \ wrapper-plug.c \ wrapper-plug.h -wrapper3_CFLAGS = \ +wrapper_2_0_CFLAGS = \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ $(GMODULE_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) -wrapper3_LDFLAGS = \ +wrapper_2_0_LDFLAGS = \ -no-undefined \ $(PLATFORM_LDFLAGS) -wrapper3_LDADD = \ +wrapper_2_0_LDADD = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \ $(GTK_LIBS) \ $(DBUS_LIBS) \ $(GMODULE_LIBS) \ $(LIBXFCE4UTIL_LIBS) -wrapper3_DEPENDENCIES = \ +wrapper_2_0_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la # @@ -47,9 +47,9 @@ wrapper3_DEPENDENCIES = \ # if ENABLE_GTK2_LIBRARY -wrapper_PROGRAMS += wrapper2 +wrapper_PROGRAMS += wrapper-1.0 -wrapper2_SOURCES = \ +wrapper_1_0_SOURCES = \ $(wrapper_built_sources) \ main.c \ wrapper-module.c \ @@ -57,25 +57,25 @@ wrapper2_SOURCES = \ wrapper-plug.c \ wrapper-plug.h -wrapper2_CFLAGS = \ +wrapper_1_0_CFLAGS = \ $(GTK2_CFLAGS) \ $(DBUS_CFLAGS) \ $(GMODULE_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) -wrapper2_LDFLAGS = \ +wrapper_1_0_LDFLAGS = \ -no-undefined \ $(PLATFORM_LDFLAGS) -wrapper2_LDADD = \ +wrapper_1_0_LDADD = \ $(top_builddir)/libxfce4panel/libxfce4panel-1.0.la \ $(GTK2_LIBS) \ $(DBUS_LIBS) \ $(GMODULE_LIBS) \ $(LIBXFCE4UTIL_LIBS) -wrapper2_DEPENDENCIES = \ +wrapper_1_0_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel-1.0.la endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 More porting to Gtk+-3 for the panel code.
Updating branch refs/heads/nick/gtk3 to 4266d3766f4e0222391967e034e1d396ae16b5a2 (commit) from 0ff5a96563d2779775b182ae87bb0229be1d (commit) commit 4266d3766f4e0222391967e034e1d396ae16b5a2 Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 7 22:41:55 2013 +0200 More porting to Gtk+-3 for the panel code. panel/panel-base-window.c | 104 ++ panel/panel-dialogs.c | 10 +- panel/panel-item-dialog.c |7 +- panel/panel-itembar.c | 164 panel/panel-plugin-external-46.c |8 +- panel/panel-plugin-external-wrapper.c |2 +- panel/panel-plugin-external.c |8 +- panel/panel-plugin-external.h |1 + panel/panel-preferences-dialog.c |8 +- panel/panel-tic-tac-toe.c | 55 +- panel/panel-window.c | 193 - 11 files changed, 323 insertions(+), 237 deletions(-) diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c index a48456d..24a0801 100644 --- a/panel/panel-base-window.c +++ b/panel/panel-base-window.c @@ -48,8 +48,8 @@ static void panel_base_window_set_property (GObject static void panel_base_window_finalize(GObject *object); static void panel_base_window_screen_changed (GtkWidget *widget, GdkScreen *previous_screen); -static gboolean panel_base_window_expose_event(GtkWidget *widget, - GdkEventExpose *event); +static gboolean panel_base_window_draw(GtkWidget *widget, + cairo_t *cr); static gboolean panel_base_window_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event); static gboolean panel_base_window_leave_notify_event (GtkWidget *widget, @@ -118,7 +118,7 @@ panel_base_window_class_init (PanelBaseWindowClass *klass) gobject_class-finalize = panel_base_window_finalize; gtkwidget_class = GTK_WIDGET_CLASS (klass); - gtkwidget_class-expose_event = panel_base_window_expose_event; + gtkwidget_class-draw = panel_base_window_draw; gtkwidget_class-enter_notify_event = panel_base_window_enter_notify_event; gtkwidget_class-leave_notify_event = panel_base_window_leave_notify_event; gtkwidget_class-composited_changed = panel_base_window_composited_changed; @@ -229,6 +229,9 @@ panel_base_window_get_property (GObject*object, PanelBaseWindow*window = PANEL_BASE_WINDOW (object); PanelBaseWindowPrivate *priv = window-priv; GdkColor *color; + GdkColor bg_color; + GdkRGBAbg_rgba; + GtkStyleContext*ctx; switch (prop_id) { @@ -252,7 +255,14 @@ panel_base_window_get_property (GObject*object, if (window-background_color != NULL) color = window-background_color; else -color = (GTK_WIDGET (window)-style-bg[GTK_STATE_NORMAL]); +{ + ctx = gtk_widget_get_style_context (GTK_WIDGET (window)); + gtk_style_context_get_background_color (ctx, GTK_STATE_NORMAL, bg_rgba); + bg_color.red = CLAMP(bg_rgba.red * 65536, 65535, 0); + bg_color.green = CLAMP(bg_rgba.green * 65536, 65535, 0); + bg_color.blue = CLAMP(bg_rgba.blue * 65536, 65535, 0); + color = bg_color; +} g_value_set_boxed (value, color); break; @@ -442,7 +452,7 @@ static void panel_base_window_screen_changed (GtkWidget *widget, GdkScreen *previous_screen) { PanelBaseWindow *window = PANEL_BASE_WINDOW (widget); - GdkColormap *colormap; + GdkVisual *visual; GdkScreen *screen; if (GTK_WIDGET_CLASS (panel_base_window_parent_class)-screen_changed != NULL) @@ -450,58 +460,55 @@ panel_base_window_screen_changed (GtkWidget *widget, GdkScreen *previous_screen) /* set the rgba colormap if supported by the screen */ screen = gtk_window_get_screen (GTK_WINDOW (window)); - colormap = gdk_screen_get_rgba_colormap (screen); - if (colormap != NULL) + visual = gdk_screen_get_rgba_visual (screen); + if (visual != NULL) { - gtk_widget_set_colormap (widget, colormap); + gtk_widget_set_visual (widget, visual); window-is_composited = gtk_widget_is_composited (widget); } panel_debug (PANEL_DEBUG_BASE_WINDOW, - %p: rgba colormap=%p, compositing=%s, window, - colormap, PANEL_DEBUG_BOOL (window-is_composited)); + %p: rgba visual=%p, compositing=%s, window, + visual, PANEL_DEBUG_BOOL (window-is_composited
[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Made libxfce4panel more in sync with gtk3 branch.
Updating branch refs/heads/andrzejr/wrapper3 to 0775a8c67b17f6140f54dc736fffda733a48273f (commit) from 1b51c7af53d9a8831c23c9daaa10e3af87c17482 (commit) commit 0775a8c67b17f6140f54dc736fffda733a48273f Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 7 23:30:40 2013 +0200 Made libxfce4panel more in sync with gtk3 branch. libxfce4panel/libxfce4panel.h |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h index 5db33c3..f6b4b22 100644 --- a/libxfce4panel/libxfce4panel.h +++ b/libxfce4panel/libxfce4panel.h @@ -19,7 +19,7 @@ #ifndef __LIBXFCE4PANEL__ #define __LIBXFCE4PANEL__ -G_BEGIN_DECLS +#include gtk/gtk.h #define LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H @@ -29,13 +29,13 @@ G_BEGIN_DECLS #include libxfce4panel/xfce-panel-macros.h #include libxfce4panel/xfce-panel-macros-46.h #include libxfce4panel/xfce-arrow-button.h +#if !GTK_CHECK_VERSION (3, 0, 0) #include libxfce4panel/xfce-hvbox.h +#endif #include libxfce4panel/xfce-panel-convenience.h #include libxfce4panel/xfce-panel-plugin.h #include libxfce4panel/xfce-panel-image.h #undef LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H -G_END_DECLS - #endif /* !__LIBXFCE4PANEL__ */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Added missing .pc file.
Updating branch refs/heads/andrzejr/wrapper3 to cc1b985fb3a7507b1fc7dec17795d2d932adb2ef (commit) from 0775a8c67b17f6140f54dc736fffda733a48273f (commit) commit cc1b985fb3a7507b1fc7dec17795d2d932adb2ef Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 7 23:40:07 2013 +0200 Added missing .pc file. ...fce4panel-1.0.pc.in = libxfce4panel-2.0.pc.in} |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libxfce4panel/libxfce4panel-1.0.pc.in b/libxfce4panel/libxfce4panel-2.0.pc.in similarity index 50% copy from libxfce4panel/libxfce4panel-1.0.pc.in copy to libxfce4panel/libxfce4panel-2.0.pc.in index a54205d..affbacf 100644 --- a/libxfce4panel/libxfce4panel-1.0.pc.in +++ b/libxfce4panel/libxfce4panel-2.0.pc.in @@ -6,7 +6,7 @@ localedir=@localedir@ Name: libxfce4panel Description: Library for the Xfce Panel -Requires: gtk+-2.0 gmodule-2.0 glib-2.0 libxfce4util-1.0 +Requires: gtk+-3.0 gmodule-2.0 glib-2.0 libxfce4util-1.0 Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lxfce4panel-@LIBXFCE4PANEL_VERSION_API@ -Cflags: -I${includedir}/xfce4/libxfce4panel-@LIBXFCE4PANEL_VERSION_API@ +Libs: -L${libdir} -lxfce4panel-2.0 +Cflags: -I${includedir}/xfce4/libxfce4panel-2.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Change WRAPPER_BIN name to match the wrapper.
Updating branch refs/heads/andrzejr/wrapper3 to e2a61080fd21a3ad4248d78b8e8212d0a06c64d4 (commit) from 004ac3eda671a30bc923930b39838225c211cf16 (commit) commit e2a61080fd21a3ad4248d78b8e8212d0a06c64d4 Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 7 23:48:36 2013 +0200 Change WRAPPER_BIN name to match the wrapper. panel/panel-plugin-external-wrapper.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panel/panel-plugin-external-wrapper.c b/panel/panel-plugin-external-wrapper.c index 89c5674..399bff1 100644 --- a/panel/panel-plugin-external-wrapper.c +++ b/panel/panel-plugin-external-wrapper.c @@ -51,8 +51,8 @@ -#define WRAPPER_BIN HELPERDIR G_DIR_SEPARATOR_S wrapper -#define WRAPPER3_BIN HELPERDIR G_DIR_SEPARATOR_S wrapper3 +#define WRAPPER_BIN HELPERDIR G_DIR_SEPARATOR_S wrapper-1.0 +#define WRAPPER3_BIN HELPERDIR G_DIR_SEPARATOR_S wrapper-2.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Wrapper ported for both Gtk+-2 and Gtk+-3
Updating branch refs/heads/andrzejr/wrapper3 to 004ac3eda671a30bc923930b39838225c211cf16 (commit) from cc1b985fb3a7507b1fc7dec17795d2d932adb2ef (commit) commit 004ac3eda671a30bc923930b39838225c211cf16 Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 7 23:45:34 2013 +0200 Wrapper ported for both Gtk+-2 and Gtk+-3 wrapper/Makefile.am| 50 +++--- wrapper/main.c |4 ++ wrapper/wrapper-plug.c | 109 wrapper/wrapper-plug.h |7 +++ 4 files changed, 164 insertions(+), 6 deletions(-) diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am index 94bb13a..e3a9359 100644 --- a/wrapper/Makefile.am +++ b/wrapper/Makefile.am @@ -8,12 +8,12 @@ AM_CPPFLAGS = \ wrapperdir = $(HELPER_PATH_PREFIX)/xfce4/panel wrapper_PROGRAMS = \ - wrapper + wrapper-1.0 wrapper_built_sources = \ wrapper-dbus-client-infos.h -wrapper_SOURCES = \ +wrapper_1_0_SOURCES = \ $(wrapper_built_sources) \ main.c \ wrapper-module.c \ @@ -21,27 +21,65 @@ wrapper_SOURCES = \ wrapper-plug.c \ wrapper-plug.h -wrapper_CFLAGS = \ +wrapper_1_0_CFLAGS = \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ $(GMODULE_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) -wrapper_LDFLAGS = \ +wrapper_1_0_LDFLAGS = \ -no-undefined \ $(PLATFORM_LDFLAGS) -wrapper_LDADD = \ +wrapper_1_0_LDADD = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \ $(GTK_LIBS) \ $(DBUS_LIBS) \ $(GMODULE_LIBS) \ $(LIBXFCE4UTIL_LIBS) -wrapper_DEPENDENCIES = \ +wrapper_1_0_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la +# +# Gtk+ 3 support library +# +if ENABLE_GTK3_LIBRARY + +wrapper_PROGRAMS += wrapper-2.0 + +wrapper_2_0_SOURCES = \ + $(wrapper_built_sources) \ + main.c \ + wrapper-module.c \ + wrapper-module.h \ + wrapper-plug.c \ + wrapper-plug.h + +wrapper_2_0_CFLAGS = \ + $(GTK3_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(PLATFORM_CFLAGS) + +wrapper_2_0_LDFLAGS = \ + -no-undefined \ + $(PLATFORM_LDFLAGS) + +wrapper_2_0_LDADD = \ + $(top_builddir)/libxfce4panel/libxfce4panel-2.0.la \ + $(GTK3_LIBS) \ + $(DBUS_LIBS) \ + $(GMODULE_LIBS) \ + $(LIBXFCE4UTIL_LIBS) + +wrapper_2_0_DEPENDENCIES = \ + $(top_builddir)/libxfce4panel/libxfce4panel-2.0.la + +endif + if MAINTAINER_MODE wrapper-dbus-client-infos.h: $(top_builddir)/panel/panel-plugin-external-wrapper-infos.xml Makefile diff --git a/wrapper/main.c b/wrapper/main.c index 2420d79..0a19ec6 100644 --- a/wrapper/main.c +++ b/wrapper/main.c @@ -271,7 +271,11 @@ main (gint argc, gchar **argv) GError *error = NULL; const gchar *filename; gint unique_id; +#if GTK_CHECK_VERSION (3, 0, 0) + Window socket_id; +#else GdkNativeWindow socket_id; +#endif const gchar *name; const gchar *display_name; const gchar *comment; diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c index 29cced3..14bac51 100644 --- a/wrapper/wrapper-plug.c +++ b/wrapper/wrapper-plug.c @@ -30,8 +30,13 @@ static void wrapper_plug_finalize (GObject*object); +#if GTK_CHECK_VERSION (3, 0, 0) +static gboolean wrapper_plug_draw (GtkWidget *widget, + cairo_t*cr); +#else static gboolean wrapper_plug_expose_event (GtkWidget *widget, GdkEventExpose *event); +#endif static void wrapper_plug_background_reset (WrapperPlug*plug); @@ -73,7 +78,11 @@ wrapper_plug_class_init (WrapperPlugClass *klass) gobject_class-finalize = wrapper_plug_finalize; gtkwidget_class = GTK_WIDGET_CLASS (klass); +#if GTK_CHECK_VERSION (3, 0, 0) + gtkwidget_class-draw = wrapper_plug_draw; +#else gtkwidget_class-expose_event = wrapper_plug_expose_event; +#endif } @@ -81,8 +90,13 @@ wrapper_plug_class_init (WrapperPlugClass *klass) static void wrapper_plug_init (WrapperPlug *plug) { +#if GTK_CHECK_VERSION (3, 0, 0) + GdkVisual *visual = NULL; + GdkScreen *screen; +#else GdkColormap *colormap = NULL; GdkScreen *screen; +#endif plug-background_alpha = 1.00; plug-background_color = NULL; @@ -103,9 +117,15 @@ wrapper_plug_init (WrapperPlug *plug) /* set the colormap */ screen = gtk_window_get_screen (GTK_WINDOW (plug)); +#if GTK_CHECK_VERSION (3, 0, 0) + visual = gdk_screen_get_rgba_visual (screen); + if (visual != NULL) +gtk_widget_set_visual (GTK_WIDGET (plug), visual); +#else colormap = gdk_screen_get_rgba_colormap (screen); if (colormap != NULL
[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Added GTK+-3 version of libxfce4panel.
Updating branch refs/heads/andrzejr/wrapper3 to 1b51c7af53d9a8831c23c9daaa10e3af87c17482 (commit) from 55f09b17a823fa1c5828f43e321311ca7f5ba891 (commit) commit 1b51c7af53d9a8831c23c9daaa10e3af87c17482 Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 7 23:08:37 2013 +0200 Added GTK+-3 version of libxfce4panel. configure.ac.in| 10 ++ libxfce4panel/Makefile.am | 45 +++ libxfce4panel/xfce-arrow-button.c | 209 libxfce4panel/xfce-panel-convenience.c |6 +- libxfce4panel/xfce-panel-image.c | 185 +++- libxfce4panel/xfce-panel-macros-46.h |6 +- libxfce4panel/xfce-panel-plugin.c | 30 -- 7 files changed, 420 insertions(+), 71 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 80d909e..654eab2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -139,6 +139,14 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.73]) XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30]) +dnl *** +dnl *** Optional support for a GTK+3 version of the library *** +dnl *** +XDT_CHECK_OPTIONAL_PACKAGE([GTK3], + [gtk+-3.0], [3.2.0], [gtk3], + [GTK+ 3 support]) +AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test x$GTK3_FOUND = xyes]) + dnl ** dnl *** Optional GIO UNIX features *** dnl ** @@ -228,6 +236,7 @@ icons/48x48/Makefile icons/scalable/Makefile libxfce4panel/Makefile libxfce4panel/libxfce4panel-1.0.pc +libxfce4panel/libxfce4panel-2.0.pc libxfce4panel/libxfce4panel-config.h migrate/Makefile migrate/default.xml @@ -256,4 +265,5 @@ echo Build Configuration: echo echo * Debug Support: $enable_debug echo * GNU Visibility: $have_gnuc_visibility +echo * GTK+ 3 Support: $GTK3_FOUND echo diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index cba5083..384d15f 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -75,6 +75,51 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).pc # +# GTK+ 3 support library +# +if ENABLE_GTK3_LIBRARY + +lib_LTLIBRARIES += libxfce4panel-2.0.la + +libxfce4panel2_includedir = \ + $(includedir)/xfce4/libxfce4panel-2.0/libxfce4panel + +libxfce4panel2_include_HEADERS = \ + $(libxfce4panel_public_built_sources) \ + $(libxfce4panel_headers) + +libxfce4panel_2_0_la_SOURCES = \ + $(libxfce4panel_built_sources) \ + $(libxfce4panel_headers) \ + libxfce4panel-config.c \ + xfce-arrow-button.c \ + xfce-panel-convenience.c \ + xfce-panel-plugin.c \ + xfce-panel-plugin-provider.c \ + xfce-panel-image.c + +libxfce4panel_2_0_la_CFLAGS = \ + $(GTK_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(PLATFORM_CFLAGS) + +libxfce4panel_2_0_la_LDFLAGS = \ + -no-undefined \ + -export-dynamic \ + -version-info $(LIBXFCE4PANEL_VERINFO) \ + -export-symbols-regex '^[^_].*' \ + $(PLATFORM_LDFLAGS) + +libxfce4panel_2_0_la_LIBADD = \ + $(GTK_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + -lm + +pkgconfig_DATA += libxfce4panel-2.0.pc + +endif + +# # Build sources # if MAINTAINER_MODE diff --git a/libxfce4panel/xfce-arrow-button.c b/libxfce4panel/xfce-arrow-button.c index 01eb2d2..bbf2369 100644 --- a/libxfce4panel/xfce-arrow-button.c +++ b/libxfce4panel/xfce-arrow-button.c @@ -66,21 +66,32 @@ enum PROP_ARROW_TYPE }; -static void xfce_arrow_button_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec*pspec); -static void xfce_arrow_button_get_property (GObject *object, - guint prop_id, - GValue*value, - GParamSpec*pspec); -static void xfce_arrow_button_finalize (GObject *object); -static gboolean xfce_arrow_button_expose_event (GtkWidget *widget, - GdkEventExpose*event); -static void xfce_arrow_button_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void xfce_arrow_button_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); +static void
[Xfce4-commits] xfce4-panel:nick/gtk3 libxfce4ui isn't used by the panel lib
Updating branch refs/heads/nick/gtk3 to 707b0e40935313cfa6018f84867783688d851c9f (commit) from f9e5f6a12098724e2e51532c4b79d322ec6a51b0 (commit) commit 707b0e40935313cfa6018f84867783688d851c9f Author: Peter de Ridder pe...@xfce.org Date: Fri Apr 5 18:50:38 2013 +0200 libxfce4ui isn't used by the panel lib configure.ac.in |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 28767b8..d3291ad 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -144,9 +144,6 @@ dnl *** XDT_CHECK_OPTIONAL_PACKAGE([GTK2], [gtk+-2.0], [2.20.0], [gtk2], [GTK+ 2 support]) -if x$GTK2_FOUND = xyes ; then -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-1], [4.9.0]) -fi AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test x$GTK2_FOUND = xyes]) dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 There shouldn't be G DECLS around includes.
Updating branch refs/heads/nick/gtk3 to cc2584b1571ba65cecb312897ebe51a85b32c43b (commit) from 707b0e40935313cfa6018f84867783688d851c9f (commit) commit cc2584b1571ba65cecb312897ebe51a85b32c43b Author: Peter de Ridder pe...@xfce.org Date: Fri Apr 5 18:53:51 2013 +0200 There shouldn't be G DECLS around includes. libxfce4panel/libxfce4panel.h |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h index 85ecbf5..f6b4b22 100644 --- a/libxfce4panel/libxfce4panel.h +++ b/libxfce4panel/libxfce4panel.h @@ -21,8 +21,6 @@ #include gtk/gtk.h -G_BEGIN_DECLS - #define LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H #include libxfce4panel/libxfce4panel-config.h @@ -40,6 +38,4 @@ G_BEGIN_DECLS #undef LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H -G_END_DECLS - #endif /* !__LIBXFCE4PANEL__ */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 Wrapper ported for both Gtk+-2 and Gtk+-3
Updating branch refs/heads/nick/gtk3 to 0ff5a96563d2779775b182ae87bb0229be1d (commit) from cc2584b1571ba65cecb312897ebe51a85b32c43b (commit) commit 0ff5a96563d2779775b182ae87bb0229be1d Author: Peter de Ridder pe...@xfce.org Date: Fri Apr 5 21:36:18 2013 +0200 Wrapper ported for both Gtk+-2 and Gtk+-3 wrapper/Makefile.am| 50 ++--- wrapper/main.c |4 ++ wrapper/wrapper-plug.c | 116 +--- wrapper/wrapper-plug.h |7 +++ 4 files changed, 164 insertions(+), 13 deletions(-) diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am index 94bb13a..86abda1 100644 --- a/wrapper/Makefile.am +++ b/wrapper/Makefile.am @@ -8,12 +8,12 @@ AM_CPPFLAGS = \ wrapperdir = $(HELPER_PATH_PREFIX)/xfce4/panel wrapper_PROGRAMS = \ - wrapper + wrapper3 wrapper_built_sources = \ wrapper-dbus-client-infos.h -wrapper_SOURCES = \ +wrapper3_SOURCES = \ $(wrapper_built_sources) \ main.c \ wrapper-module.c \ @@ -21,27 +21,65 @@ wrapper_SOURCES = \ wrapper-plug.c \ wrapper-plug.h -wrapper_CFLAGS = \ +wrapper3_CFLAGS = \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ $(GMODULE_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) -wrapper_LDFLAGS = \ +wrapper3_LDFLAGS = \ -no-undefined \ $(PLATFORM_LDFLAGS) -wrapper_LDADD = \ +wrapper3_LDADD = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \ $(GTK_LIBS) \ $(DBUS_LIBS) \ $(GMODULE_LIBS) \ $(LIBXFCE4UTIL_LIBS) -wrapper_DEPENDENCIES = \ +wrapper3_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la +# +# Gtk+ 2 support library +# +if ENABLE_GTK2_LIBRARY + +wrapper_PROGRAMS += wrapper2 + +wrapper2_SOURCES = \ + $(wrapper_built_sources) \ + main.c \ + wrapper-module.c \ + wrapper-module.h \ + wrapper-plug.c \ + wrapper-plug.h + +wrapper2_CFLAGS = \ + $(GTK2_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(PLATFORM_CFLAGS) + +wrapper2_LDFLAGS = \ + -no-undefined \ + $(PLATFORM_LDFLAGS) + +wrapper2_LDADD = \ + $(top_builddir)/libxfce4panel/libxfce4panel-1.0.la \ + $(GTK2_LIBS) \ + $(DBUS_LIBS) \ + $(GMODULE_LIBS) \ + $(LIBXFCE4UTIL_LIBS) + +wrapper2_DEPENDENCIES = \ + $(top_builddir)/libxfce4panel/libxfce4panel-1.0.la + +endif + if MAINTAINER_MODE wrapper-dbus-client-infos.h: $(top_builddir)/panel/panel-plugin-external-wrapper-infos.xml Makefile diff --git a/wrapper/main.c b/wrapper/main.c index 2420d79..0a19ec6 100644 --- a/wrapper/main.c +++ b/wrapper/main.c @@ -271,7 +271,11 @@ main (gint argc, gchar **argv) GError *error = NULL; const gchar *filename; gint unique_id; +#if GTK_CHECK_VERSION (3, 0, 0) + Window socket_id; +#else GdkNativeWindow socket_id; +#endif const gchar *name; const gchar *display_name; const gchar *comment; diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c index 29cced3..d00784e 100644 --- a/wrapper/wrapper-plug.c +++ b/wrapper/wrapper-plug.c @@ -30,8 +30,13 @@ static void wrapper_plug_finalize (GObject*object); +#if GTK_CHECK_VERSION (3, 0, 0) +static gboolean wrapper_plug_draw (GtkWidget *widget, + cairo_t*cr); +#else static gboolean wrapper_plug_expose_event (GtkWidget *widget, GdkEventExpose *event); +#endif static void wrapper_plug_background_reset (WrapperPlug*plug); @@ -73,7 +78,11 @@ wrapper_plug_class_init (WrapperPlugClass *klass) gobject_class-finalize = wrapper_plug_finalize; gtkwidget_class = GTK_WIDGET_CLASS (klass); +#if GTK_CHECK_VERSION (3, 0, 0) + gtkwidget_class-draw = wrapper_plug_draw; +#else gtkwidget_class-expose_event = wrapper_plug_expose_event; +#endif } @@ -81,8 +90,13 @@ wrapper_plug_class_init (WrapperPlugClass *klass) static void wrapper_plug_init (WrapperPlug *plug) { +#if GTK_CHECK_VERSION (3, 0, 0) + GdkVisual *visual = NULL; + GdkScreen *screen; +#else GdkColormap *colormap = NULL; GdkScreen *screen; +#endif plug-background_alpha = 1.00; plug-background_color = NULL; @@ -94,18 +108,17 @@ wrapper_plug_init (WrapperPlug *plug) /* allow painting, else compositing won't work */ gtk_widget_set_app_paintable (GTK_WIDGET (plug), TRUE); - /* old versions of gtk don't support transparent tray icons, if we - * set an argb colormap on the tray, the icons won't be embedded because - * the socket-plugin implementation requires identical colormaps */ - if (gtk_check_version (2, 16, 0) != NULL
[Xfce4-commits] xfce4-panel:nick/gtk3 Added GTK+-2 version if libxfce4panel.
Updating branch refs/heads/nick/gtk3 to cdbbcdceba06edfb5bfe92d7f1348a662debd534 (commit) from 12c8c133f9a08d350987f01ef3ada7824708a254 (commit) commit cdbbcdceba06edfb5bfe92d7f1348a662debd534 Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 24 21:10:18 2013 +0100 Added GTK+-2 version if libxfce4panel. configure.ac.in| 15 +- libxfce4panel/Makefile.am | 57 - libxfce4panel/libxfce4panel-1.0.pc.in |4 +- ...fce4panel-1.0.pc.in = libxfce4panel-2.0.pc.in} |2 +- libxfce4panel/xfce-arrow-button.c | 108 +++ libxfce4panel/xfce-hvbox.c | 306 libxfce4panel/xfce-hvbox.h | 77 + libxfce4panel/xfce-panel-image.c | 111 +++- libxfce4panel/xfce-panel-plugin.c | 11 + 9 files changed, 680 insertions(+), 11 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index b8cecd0..28767b8 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,7 +9,7 @@ dnl *** dnl *** Version information *** dnl *** m4_define([libxfce4panel_verinfo], [4:0:0]) dnl current:revision:age -m4_define([libxfce4panel_version_api], [1.0]) +m4_define([libxfce4panel_version_api], [2.0]) m4_define([xfce4_panel_config_version], [2]) m4_define([xfce4_panel_version_major], [4]) m4_define([xfce4_panel_version_minor], [10]) @@ -138,6 +138,17 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.73]) XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [3.0]) +dnl *** +dnl *** Optional support for a GTK+2 version of the library *** +dnl *** +XDT_CHECK_OPTIONAL_PACKAGE([GTK2], + [gtk+-2.0], [2.20.0], [gtk2], + [GTK+ 2 support]) +if x$GTK2_FOUND = xyes ; then +XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-1], [4.9.0]) +fi +AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test x$GTK2_FOUND = xyes]) + dnl ** dnl *** Optional GIO UNIX features *** dnl ** @@ -227,6 +238,7 @@ icons/48x48/Makefile icons/scalable/Makefile libxfce4panel/Makefile libxfce4panel/libxfce4panel-1.0.pc +libxfce4panel/libxfce4panel-2.0.pc libxfce4panel/libxfce4panel-config.h migrate/Makefile migrate/default.xml @@ -255,4 +267,5 @@ echo Build Configuration: echo echo * Debug Support: $enable_debug echo * GNU Visibility: $have_gnuc_visibility +echo * GTK+ 2 Support: $GTK2_FOUND echo diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index 0da0b1d..029e7f4 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ $(PLATFORM_CPPFLAGS) lib_LTLIBRARIES = \ - libxfce4panel-1.0.la + libxfce4panel-2.0.la libxfce4panel_public_built_sources = \ libxfce4panel-enum-types.h @@ -39,7 +39,7 @@ libxfce4panel_include_HEADERS = \ $(libxfce4panel_public_built_sources) \ $(libxfce4panel_headers) -libxfce4panel_1_0_la_SOURCES = \ +libxfce4panel_2_0_la_SOURCES = \ $(libxfce4panel_built_sources) \ $(libxfce4panel_headers) \ libxfce4panel-config.c \ @@ -49,19 +49,19 @@ libxfce4panel_1_0_la_SOURCES = \ xfce-panel-plugin-provider.c \ xfce-panel-image.c -libxfce4panel_1_0_la_CFLAGS = \ +libxfce4panel_2_0_la_CFLAGS = \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) -libxfce4panel_1_0_la_LDFLAGS = \ +libxfce4panel_2_0_la_LDFLAGS = \ -no-undefined \ -export-dynamic \ -version-info $(LIBXFCE4PANEL_VERINFO) \ -export-symbols-regex '^[^_].*' \ $(PLATFORM_LDFLAGS) -libxfce4panel_1_0_la_LIBADD = \ +libxfce4panel_2_0_la_LIBADD = \ $(GTK_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ -lm @@ -73,6 +73,53 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).pc # +# Gtk+ 2 support library +# +if ENABLE_GTK2_LIBRARY + +lib_LTLIBRARIES += libxfce4panel-1.0.la + +libxfce4panel1_includedir = \ + $(includedir)/xfce4/libxfce4panel-1.0/libxfce4panel + +libxfce4panel1_include_HEADERS = \ + $(libxfce4panel_public_built_sources) \ + $(libxfce4panel_headers) \ + xfce-hvbox.h + +libxfce4panel_1_0_la_SOURCES = \ + $(libxfce4panel_built_sources) \ + $(libxfce4panel_headers) \ + libxfce4panel-config.c \ + xfce-arrow-button.c \ + xfce-hvbox.c \ + xfce-panel-convenience.c \ + xfce-panel-plugin.c \ + xfce-panel-plugin-provider.c \ + xfce-panel-image.c + +libxfce4panel_1_0_la_CFLAGS = \ + $(GTK2_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(PLATFORM_CFLAGS
[Xfce4-commits] xfce4-panel:nick/gtk3 Added back xfce-hvbox.h for GTK+-2.
Updating branch refs/heads/nick/gtk3 to f9e5f6a12098724e2e51532c4b79d322ec6a51b0 (commit) from cdbbcdceba06edfb5bfe92d7f1348a662debd534 (commit) commit f9e5f6a12098724e2e51532c4b79d322ec6a51b0 Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 24 21:38:15 2013 +0100 Added back xfce-hvbox.h for GTK+-2. libxfce4panel/libxfce4panel.h |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h index a64907b..85ecbf5 100644 --- a/libxfce4panel/libxfce4panel.h +++ b/libxfce4panel/libxfce4panel.h @@ -19,6 +19,8 @@ #ifndef __LIBXFCE4PANEL__ #define __LIBXFCE4PANEL__ +#include gtk/gtk.h + G_BEGIN_DECLS #define LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H @@ -29,6 +31,9 @@ G_BEGIN_DECLS #include libxfce4panel/xfce-panel-macros.h #include libxfce4panel/xfce-panel-macros-46.h #include libxfce4panel/xfce-arrow-button.h +#if !GTK_CHECK_VERSION (3, 0, 0) +#include libxfce4panel/xfce-hvbox.h +#endif #include libxfce4panel/xfce-panel-convenience.h #include libxfce4panel/xfce-panel-plugin.h #include libxfce4panel/xfce-panel-image.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] squeeze:peter/refactoring Removed invalid line from datetime compare
Updating branch refs/heads/peter/refactoring to ee647328220cce8413c2fbabb383ce375d62c6a3 (commit) from 9c4208f15d0c29eb313810b65d4ae37582148b53 (commit) commit ee647328220cce8413c2fbabb383ce375d62c6a3 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 26 12:27:38 2012 +0100 Removed invalid line from datetime compare libsqueeze/datetime.c |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/libsqueeze/datetime.c b/libsqueeze/datetime.c index 1402034..644b899 100644 --- a/libsqueeze/datetime.c +++ b/libsqueeze/datetime.c @@ -267,10 +267,7 @@ lsq_datetime_cmp ( /* Ignoring daylight saveing */ cmp = LSQ_DATETIME_CMP_MASK( a ) - LSQ_DATETIME_CMP_MASK( b ); -if ( 0 != cmp ) -return cmp; - -return difftime( mktime( (struct tm *)a ), mktime( (struct tm *)b ) ); +return cmp; } LSQDateTime ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] squeeze:peter/libsqueeze Creating branch peter/libsqueeze
Updating branch refs/heads/peter/libsqueeze as new branch to 40a75344fa2918b78db21818bdb6bab987bee012 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/peter/libsqueeze for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] squeeze:peter/libsqueeze Solved some invalid memory accesses
Updating branch refs/heads/peter/libsqueeze to cb2820bac787558ef5c81c18f1c1a7e14a2f58ab (commit) from c377a7b361708fc4e6ad4489dba4dc76e9a90025 (commit) commit cb2820bac787558ef5c81c18f1c1a7e14a2f58ab Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 11 18:18:03 2012 +0100 Solved some invalid memory accesses libsqueeze/archive.c|2 +- libsqueeze/datetime.c | 13 - libsqueeze/datetime.h |4 ++-- libsqueeze/libsqueeze.c |3 +++ libsqueeze/support-app.c|5 + libsqueeze/support-info.c |9 +++-- libsqueeze/support-info.h |4 libsqueeze/support-reader.c |2 +- 8 files changed, 31 insertions(+), 11 deletions(-) diff --git a/libsqueeze/archive.c b/libsqueeze/archive.c index 3e343d3..fb2c876 100644 --- a/libsqueeze/archive.c +++ b/libsqueeze/archive.c @@ -507,7 +507,7 @@ lsq_archive_operate ( case LSQ_COMMAND_TYPE_REFRESH: lsq_archive_set_refresh_app( archive, app ); app = archive-priv-refresh_app; -if ( NULL != app-refresh_cmd_queue ) +if ( NULL != app NULL != app-refresh_cmd_queue ) { ctx = lsq_command_queue_execute( app-refresh_cmd_queue, archive, NULL, NULL, app-file-parser, error ); } diff --git a/libsqueeze/datetime.c b/libsqueeze/datetime.c index c26403d..4c6336a 100644 --- a/libsqueeze/datetime.c +++ b/libsqueeze/datetime.c @@ -118,7 +118,7 @@ value_datetime_to_string ( } } -GType +static GType lsq_datetime_get_type ( void ) { static GType type = G_TYPE_INVALID; @@ -167,13 +167,16 @@ lsq_datetime_get_type ( void ) return type; } +GType +lsq_datetime_get_type_const ( void ) +{ +return lsq_datetime_get_type(); +} + void lsq_datetime_register_type ( void ) { -/* Force lsq_datetime_get_type to get called, and not optimized by G_GNUC_CONST */ -volatile GType type; -type = lsq_datetime_get_type(); -type; +lsq_datetime_get_type(); } LSQDateTime diff --git a/libsqueeze/datetime.h b/libsqueeze/datetime.h index 05e1000..8f3495a 100644 --- a/libsqueeze/datetime.h +++ b/libsqueeze/datetime.h @@ -19,7 +19,7 @@ G_BEGIN_DECLS -#define LSQ_TYPE_DATETIME lsq_datetime_get_type() +#define LSQ_TYPE_DATETIME lsq_datetime_get_type_const() #define LSQ_DATETIME(v) ((LSQDateTime)(v)) #define LSQ_DATETIME_NULL (LSQ_DATETIME(0)) @@ -29,7 +29,7 @@ G_BEGIN_DECLS typedef gint64 LSQDateTime; GType -lsq_datetime_get_type ( void ) G_GNUC_CONST; +lsq_datetime_get_type_const ( void ) G_GNUC_CONST; void lsq_datetime_register_type ( void ); diff --git a/libsqueeze/libsqueeze.c b/libsqueeze/libsqueeze.c index 1c8316b..65a40b7 100644 --- a/libsqueeze/libsqueeze.c +++ b/libsqueeze/libsqueeze.c @@ -28,6 +28,7 @@ #include internals.h #include support-reader.h #include support-file.h +#include support-info.h #include archive.h #include libsqueeze.h @@ -93,6 +94,8 @@ lsq_init ( void ) lsq_support_file_table = g_hash_table_new( g_str_hash, g_str_equal ); +lsq_init_support_info(); + #ifndef NO_XDG_DATA_DIRS data_squeeze = g_build_filename( user_dir, squeeze, NULL ); lsq_read_squeeze_dir( data_squeeze ); diff --git a/libsqueeze/support-app.c b/libsqueeze/support-app.c index d40e082..f29b44a 100644 --- a/libsqueeze/support-app.c +++ b/libsqueeze/support-app.c @@ -69,6 +69,8 @@ lsq_support_app_new ( LSQSupportFile *file ) const gchar * lsq_support_app_get_id ( const LSQSupportApp *app ) { +g_return_val_if_fail( LSQ_IS_SUPPORT_APP( app ), NULL ); + return app-id; } @@ -78,6 +80,9 @@ lsq_support_app_compare_id ( const gchar *id ) { +g_return_val_if_fail( LSQ_IS_SUPPORT_APP( app ), -1 ); +g_return_val_if_fail( NULL != id, 1 ); + return strcmp( app-id, id ); } diff --git a/libsqueeze/support-info.c b/libsqueeze/support-info.c index 50fc63c..3e3cf33 100644 --- a/libsqueeze/support-info.c +++ b/libsqueeze/support-info.c @@ -48,12 +48,17 @@ struct _LSQSupportInfoClass G_DEFINE_TYPE ( LSQSupportInfo, lsq_support_info, G_TYPE_OBJECT ); -GHashTable *lsq_support_info_table; +GHashTable *lsq_support_info_table = NULL; + +void +lsq_init_support_info ( void ) +{ +lsq_support_info_table = g_hash_table_new( g_str_hash, g_str_equal ); +} static void lsq_support_info_class_init ( LSQSupportInfoClass *klass ) { -lsq_support_info_table = g_hash_table_new( g_str_hash, g_str_equal ); } static void diff --git a/libsqueeze/support-info.h b/libsqueeze/support-info.h index ac8a25a..7db702f 100644 --- a/libsqueeze/support-info.h +++ b/libsqueeze/support-info.h @@ -24,6 +24,10 @@ G_BEGIN_DECLS typedef struct _LSQSupportInfoClass LSQSupportInfoClass; +void +lsq_init_support_info ( void ); + + LSQSupportInfo * lsq_support_info_new ( const gchar *contentype ); diff --git a/libsqueeze/support-reader.c b/libsqueeze/support-reader.c index 13adf99..68fc502 100644 --- a/libsqueeze/support-reader.c
[Xfce4-commits] squeeze:peter/libsqueeze Pick a support app if none is given
Updating branch refs/heads/peter/libsqueeze to 502e288247fee04515fec09b630bfc8e2fbad663 (commit) from cb2820bac787558ef5c81c18f1c1a7e14a2f58ab (commit) commit 502e288247fee04515fec09b630bfc8e2fbad663 Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 11 18:37:10 2012 +0100 Pick a support app if none is given libsqueeze/archive.c| 54 ++ libsqueeze/libsqueeze-support.h | 12 libsqueeze/support-app.c| 30 + libsqueeze/support-info.c | 28 +++- 4 files changed, 111 insertions(+), 13 deletions(-) diff --git a/libsqueeze/archive.c b/libsqueeze/archive.c index fb2c876..763e065 100644 --- a/libsqueeze/archive.c +++ b/libsqueeze/archive.c @@ -427,6 +427,29 @@ lsq_archive_get_support_mask ( const LSQArchive *archive ) } */ +static const LSQSupportApp * +lsq_archive_get_app_for_operation ( +LSQArchive *archive, +LSQCommandType cmd +) +{ +const LSQSupportApp *app = NULL; +GSList *list; + +g_return_val_if_fail( LSQ_IS_ARCHIVE( archive ), NULL ); + +/* Find the first supporting app */ +list = lsq_support_info_get_apps_by_operation( archive-priv-s_info, cmd ); + +if ( NULL != list ) +{ +app = LSQ_SUPPORT_APP( list-data ); +g_slist_free( list ); +} + +return app; +} + void lsq_archive_set_refresh_app ( LSQArchive *archive, @@ -442,6 +465,7 @@ lsq_archive_set_refresh_app ( if ( NULL == app ) { /* Find the first refresh supporting app */ + app = lsq_archive_get_app_for_operation( archive, LSQ_COMMAND_TYPE_REFRESH ); } } archive-priv-refresh_app = app; @@ -476,32 +500,38 @@ lsq_archive_operate ( { case LSQ_COMMAND_TYPE_ADD: g_return_val_if_fail( files, NULL ); - /* -if ( NULL != s_info-add_cmd_queue ) +if ( NULL == app) +{ +app = lsq_archive_get_app_for_operation( archive, LSQ_COMMAND_TYPE_ADD ); +} +if ( NULL != app NULL != app-add_cmd_queue ) { -ctx = lsq_command_queue_execute( s_info-add_cmd_queue, archive, files, NULL, NULL, error ); +ctx = lsq_command_queue_execute( app-add_cmd_queue, archive, files, NULL, NULL, error ); } - */ break; case LSQ_COMMAND_TYPE_REMOVE: g_return_val_if_fail( files, NULL ); - /* -if ( NULL != s_info-remove_cmd_queue ) +if ( NULL == app) { -ctx = lsq_command_queue_execute( s_info-remove_cmd_queue, archive, files, NULL, NULL, error ); +app = lsq_archive_get_app_for_operation( archive, LSQ_COMMAND_TYPE_REMOVE ); +} +if ( NULL != app NULL != app-remove_cmd_queue ) +{ +ctx = lsq_command_queue_execute( app-remove_cmd_queue, archive, files, NULL, NULL, error ); } - */ break; case LSQ_COMMAND_TYPE_EXTRACT: g_return_val_if_fail( directory, NULL ); - /* -if ( NULL != s_info-extract_cmd_queue ) +if ( NULL == app) +{ +app = lsq_archive_get_app_for_operation( archive, LSQ_COMMAND_TYPE_EXTRACT ); +} +if ( NULL != app NULL != app-extract_cmd_queue ) { -ctx = lsq_command_queue_execute( s_info-extract_cmd_queue, archive, files, directory, NULL, error ); +ctx = lsq_command_queue_execute( app-extract_cmd_queue, archive, files, directory, NULL, error ); } - */ break; case LSQ_COMMAND_TYPE_REFRESH: diff --git a/libsqueeze/libsqueeze-support.h b/libsqueeze/libsqueeze-support.h index dedc7d4..9de8d93 100644 --- a/libsqueeze/libsqueeze-support.h +++ b/libsqueeze/libsqueeze-support.h @@ -89,6 +89,12 @@ lsq_support_info_get_contentype ( const LSQSupportInfo *info ); GSList * lsq_support_info_get_apps ( const LSQSupportInfo *info ) G_GNUC_WARN_UNUSED_RESULT; +GSList * +lsq_support_info_get_apps_by_operation ( +const LSQSupportInfo *info, +LSQCommandType cmd +) G_GNUC_WARN_UNUSED_RESULT; + const LSQSupportApp * lsq_support_info_get_app_by_id ( const LSQSupportInfo *info, @@ -98,6 +104,12 @@ lsq_support_info_get_app_by_id ( const gchar * lsq_support_app_get_id ( const LSQSupportApp *app ); +gboolean +lsq_support_app_has_operation ( +const LSQSupportApp *app, +LSQCommandType cmd +); + GList * lsq_support_info_get_all ( void ) G_GNUC_WARN_UNUSED_RESULT; diff --git a/libsqueeze/support-app.c b/libsqueeze/support-app.c index f29b44a..a31a56f 100644 --- a/libsqueeze/support-app.c +++ b/libsqueeze/support-app.c @@ -86,6 +86,36 @@ lsq_support_app_compare_id ( return strcmp( app
[Xfce4-commits] squeeze:peter/libsqueeze Configure time selection of refresh parser
Updating branch refs/heads/peter/libsqueeze to d62f93326d0b937d53cbb2b80b0c8e2862421cc6 (commit) from 502e288247fee04515fec09b630bfc8e2fbad663 (commit) commit d62f93326d0b937d53cbb2b80b0c8e2862421cc6 Author: Peter de Ridder pe...@xfce.org Date: Sun Jun 17 13:26:59 2012 +0200 Configure time selection of refresh parser .gitignore |3 ++ configure.in.in |3 ++ data/Makefile.am| 10 ++--- data/gnu-tar.squeeze| 77 data/gnu-tar.squeeze.in | 81 +++ data/unzip.squeeze | 34 --- data/unzip.squeeze.in | 51 + data/zip.squeeze| 45 -- data/zip.squeeze.in | 57 + 9 files changed, 199 insertions(+), 162 deletions(-) diff --git a/.gitignore b/.gitignore index 4702bae..4ad5a06 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ config.status config.sub configure configure.in +data/gnu-tar.squeeze +data/zip.squeeze +data/unzip.squeeze depcomp docs/reference/libsqueeze/version.xml gtk-doc.make diff --git a/configure.in.in b/configure.in.in index 8ecc71f..c037b4b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -172,6 +172,9 @@ icons/48x48/Makefile icons/scalable/Makefile pixmaps/Makefile data/Makefile +data/gnu-tar.squeeze +data/zip.squeeze +data/unzip.squeeze docs/Makefile docs/reference/Makefile docs/reference/libsqueeze/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 63126e1..dcc7afe 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,8 +1,6 @@ squeezedir = $(datadir)/squeeze -squeeze_DATA = gnu-tar.squeeze \ - zip.squeeze \ - unzip.squeeze +squeeze_in_files = gnu-tar.squeeze.in zip.squeeze.in unzip.squeeze.in +squeeze_DATA = $(squeeze_in_files:.squeeze.in=.squeeze) -EXTRA_DIST = $(squeeze_DATA) - -# DISCLEANFILES = $(squeeze_DATA) +EXTRA_DIST = $(squeeze_in_files) +DISTCLEANFILES = $(squeeze_DATA) diff --git a/data/gnu-tar.squeeze b/data/gnu-tar.squeeze deleted file mode 100644 index 3a59abf..000 --- a/data/gnu-tar.squeeze +++ /dev/null @@ -1,77 +0,0 @@ -[Desktop Entry] -Name=Gnu Tar -Version=1.0 -Type=X-Squeeze-Archiver -MimeType=application/x-tar;application/x-tarz;application/x-tzo;application/x-compressed-tar;application/x-bzip-compressed-tar -X-Squeeze-Version=0.3 - -[application/x-tar] -X-Squeeze-Requires=tar -X-Squeeze-New=tar -cf %a %F -X-Squeeze-Add=tar -rf %a %F -X-Squeeze-Remove=tar -f %a --delete %F -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-compressed-tar] -X-Squeeze-Requires=tar;gzip;gunzip -X-Squeeze-New=tar -zcf %a %F -X-Squeeze-Add=gunzip -c %a %t;tar -rf %a %F;gzip -c %t %a -X-Squeeze-Remove=gunzip -c %a %t;tar -f %t --delete %F; gzip -c %t %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-bzip-compressed-tar] -X-Squeeze-Requires=tar;bzip2;bunzip2 -X-Squeeze-New=tar -jcf %a %F -X-Squeeze-Add=bunzip2 -c %a %t;tar -rf %t %F;bzip2 -c %t %a -X-Squeeze-Remove=bunzip2 -c %a %t;tar -f %t --delete %F; bzip2 -c %t %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-tarz] -X-Squeeze-Requires=tar;compress;uncompress -X-Squeeze-New=tar -Zcf %a %F -X-Squeeze-Add=lzop -dc %a %t;tar -rf %t %F;lzop -c %t %a -X-Squeeze-Remove=uncompress -c %a %t;tar -f %t --delete %F; compress -c %t %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-tzo] -X-Squeeze-Requires=tar;lzop -X-Squeeze-New=tar -cf --use-compress-program=lzop %a %F -X-Squeeze-Add=uncompress -c %a %t;tar -rf %t %F;compress -c %t %a -X-Squeeze-Remove=lzop -dc %a %t;tar -f %t --delete %F; lzop -c %t %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[Squeeze-Add] -[Squeeze-Remove] -[Squeeze-Extract] - -# Tar does not support passwords, this is just for illustrative purposes - -# X-Squeeze-Options=Password;Overwrite - -[Squeeze-Refresh] -X-Squeeze-Headers=Rights;Owner/Group;Size;Date;Time - -# Tar does not support passwords, this is just for illustrative purposes - -# X-Squeeze-Options=Password - -# I wonder if this will be enough... -X-Squeeze-Parse=%s %s %u %s %s %F -X-Squeeze-Separator=space - -[Squeeze-Option-Password] -X-Squeeze-Flag=-p %s -X-Squeeze-Type=String -X-Squeeze-Value= -X-Squeeze-Description=Password - -[Squeeze-Option-Overwrite] -X-Squeeze-Flag=-f -X-Squeeze-Type=Bool -X-Squeeze-Value=FALSE -X-Squeeze-Description=Overwrite files diff --git a/data/gnu-tar.squeeze.in b/data/gnu
[Xfce4-commits] squeeze:peter/libsqueeze Use the api in the application
Updating branch refs/heads/peter/libsqueeze to 40a75344fa2918b78db21818bdb6bab987bee012 (commit) from d62f93326d0b937d53cbb2b80b0c8e2862421cc6 (commit) commit 40a75344fa2918b78db21818bdb6bab987bee012 Author: Peter de Ridder pe...@xfce.org Date: Sun Jun 17 17:49:12 2012 +0200 Use the api in the application src/application.c| 32 ++--- src/archive_store.c |2 +- src/extract_dialog.c |1 + src/main_window.c| 75 ++ src/new_dialog.c |8 +++-- src/notebook.c |4 +- src/tool_bar.c |2 +- 7 files changed, 82 insertions(+), 42 deletions(-) diff --git a/src/application.c b/src/application.c index 2e2688b..8bb2a85 100644 --- a/src/application.c +++ b/src/application.c @@ -149,9 +149,12 @@ gint sq_application_extract_archive(SQApplication *app, GFile *file, gchar *dest_path) { GtkWidget *dialog = NULL; - LSQArchive *lp_archive = NULL; +LSQArchive *archive; GtkWidget *message_dialog; - if(lsq_open_archive(file, lp_archive)) +LSQExecuteContext *operation; + +archive = lsq_open_archive( file, NULL ); +if ( NULL == archive ) { /* * Could not open archive (mime type not supported or file did not exist) @@ -165,7 +168,7 @@ sq_application_extract_archive(SQApplication *app, GFile *file, gchar *dest_path } if(!dest_path) { - GtkWidget *extr_dialog = sq_extract_archive_dialog_new(lp_archive, 0); +GtkWidget *extr_dialog = sq_extract_archive_dialog_new( archive, 0 ); gint result = gtk_dialog_run (GTK_DIALOG (extr_dialog) ); if(result == GTK_RESPONSE_OK) { @@ -176,12 +179,13 @@ sq_application_extract_archive(SQApplication *app, GFile *file, gchar *dest_path } if(!dest_path) { - lsq_close_archive(lp_archive); +lsq_close_archive( archive ); return 1; } - message_dialog = sq_message_dialog_new(GTK_WINDOW_TOPLEVEL, lp_archive); +message_dialog = sq_message_dialog_new( GTK_WINDOW_TOPLEVEL, archive ); gtk_widget_show(message_dialog); - if(!lsq_archive_operate(lp_archive, LSQ_COMMAND_TYPE_EXTRACT, NULL, dest_path)) +operation = lsq_archive_operate( archive, LSQ_COMMAND_TYPE_EXTRACT, NULL, dest_path, NULL, NULL ); +if ( NULL == operation ) { GtkWidget *warning_dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -195,6 +199,7 @@ sq_application_extract_archive(SQApplication *app, GFile *file, gchar *dest_path } } +g_object_unref( operation ); g_object_ref(app); return 0; } @@ -204,8 +209,9 @@ sq_application_new_archive(SQApplication *app, GFile *file, GSList *files) { GtkWidget *dialog = NULL; gint result = 0; - LSQArchive *lp_archive = NULL; +LSQArchive *archive; GtkWidget *message_dialog; +LSQExecuteContext *operation; if(!file) { @@ -226,7 +232,8 @@ sq_application_new_archive(SQApplication *app, GFile *file, GSList *files) file = sq_new_archive_dialog_get_file(SQ_NEW_ARCHIVE_DIALOG(dialog)); gtk_widget_destroy (GTK_WIDGET (dialog) ); } - if(lsq_new_archive(file, TRUE, lp_archive)) +archive = lsq_new_archive( file, NULL, TRUE, NULL ); +if ( NULL == archive ) { /* * Could not create archive (mime type unsupported) @@ -242,7 +249,8 @@ sq_application_new_archive(SQApplication *app, GFile *file, GSList *files) } else { - if(lsq_open_archive(file, lp_archive)) +archive = lsq_open_archive( file, NULL ); +if ( NULL == archive ) { /* * Could not open archive (mime type not supported or file did not exist) @@ -255,10 +263,11 @@ sq_application_new_archive(SQApplication *app, GFile *file, GSList *files) return 1; } } - message_dialog = sq_message_dialog_new(GTK_WINDOW_TOPLEVEL, lp_archive); +message_dialog = sq_message_dialog_new( GTK_WINDOW_TOPLEVEL, archive ); gtk_widget_show(message_dialog); - if(!lsq_archive_operate(lp_archive, LSQ_COMMAND_TYPE_ADD, NULL, NULL)) +operation = lsq_archive_operate( archive, LSQ_COMMAND_TYPE_ADD, NULL, NULL, NULL, NULL ); +if ( NULL == operation ) { /* FIXME: show warning dialog */ GtkWidget *warning_dialog = gtk_message_dialog_new( @@ -270,6 +279,7 @@ sq_application_new_archive(SQApplication *app, GFile *file, GSList *files
[Xfce4-commits] gtk-xfce-engine:master Release 3.0.1!
Updating branch refs/heads/master to bd46665d0504816f3ececc3e18b0ece53942659c (commit) from 964d4a05896bcb6dfbeec34dccb77e4f381363f1 (commit) commit bd46665d0504816f3ececc3e18b0ece53942659c Author: Peter de Ridder pe...@xfce.org Date: Sat Sep 8 21:28:10 2012 +0200 Release 3.0.1! NEWS|5 + configure.in.in |4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 461e030..087e894 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +3.0.1 += +- Don't leak a graduent pattern at each draw (bug #8521). +- Default themes don't support Gtk+-3.4. + 3.0.0 = - Added px for border sizes. diff --git a/configure.in.in b/configure.in.in index 76eb561..1153097 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,10 +7,10 @@ dnl *** Version information *** dnl *** m4_define([gtk_xfce_engine_version_major], [3]) m4_define([gtk_xfce_engine_version_minor], [0]) -m4_define([gtk_xfce_engine_version_micro], [0]) +m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], [git]) +m4_define([gtk_xfce_engine_version_tag], []) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Post release tag bump.
Updating branch refs/heads/master to 52153bb152315dfe844c0eaf60b8194fa7a89d06 (commit) from bd46665d0504816f3ececc3e18b0ece53942659c (commit) commit 52153bb152315dfe844c0eaf60b8194fa7a89d06 Author: Peter de Ridder pe...@xfce.org Date: Sat Sep 8 21:36:20 2012 +0200 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 1153097..eba32bf 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [0]) m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], []) +m4_define([gtk_xfce_engine_version_tag], [git]) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine|gtk-xfce-engine-3.0.1 Creating annotated tag gtk-xfce-engine-3.0.1
Updating annotated tag refs/tags/gtk-xfce-engine-3.0.1 as new annotated tag to 9094e6c649654e6d4401a0af090192bc207a0fdf (tag) succeeds gtk-xfce-engine-3.0.0-2-g964d4a0 tagged by Peter de Ridder pe...@xfce.org on 2012-09-08 21:35 +0200 Peter de Ridder (1): Release 3.0.1! ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Don't leak a graduent pattern at each draw (bug #8521)
Updating branch refs/heads/master to 964d4a05896bcb6dfbeec34dccb77e4f381363f1 (commit) from c1c38420c532808e92089426ea301fe4ad8441ac (commit) commit 964d4a05896bcb6dfbeec34dccb77e4f381363f1 Author: Landry Breuil lan...@xfce.org Date: Wed Aug 22 09:34:45 2012 +0200 Don't leak a graduent pattern at each draw (bug #8521) gtk-2.0/gradient_draw.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/gtk-2.0/gradient_draw.c b/gtk-2.0/gradient_draw.c index 02deb88..37af559 100644 --- a/gtk-2.0/gradient_draw.c +++ b/gtk-2.0/gradient_draw.c @@ -278,4 +278,6 @@ void gradient_draw_shaded(cairo_t *cr, gint x, gint y, gint width, gint height, cairo_fill (cr); cairo_restore(cr); + +cairo_pattern_destroy(gradient); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Added circular scrolling for touchpads.
Updating branch refs/heads/master to 267b4df56f48449d2e9c478554053d26ea3eeb0a (commit) from 03ec008e8407808687f2e8e0b218335dc4653140 (commit) commit 267b4df56f48449d2e9c478554053d26ea3eeb0a Author: Peter de Ridder pe...@xfce.org Date: Tue May 1 20:50:53 2012 +0200 Added circular scrolling for touchpads. dialogs/mouse-settings/main.c | 44 +++- dialogs/mouse-settings/mouse-dialog.glade | 17 +++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c index 86230c5..5f0707b 100644 --- a/dialogs/mouse-settings/main.c +++ b/dialogs/mouse-settings/main.c @@ -803,6 +803,11 @@ mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) sensitive = TRUE; +object = gtk_builder_get_object (builder, synaptics-scroll-circ); +if (gtk_widget_get_sensitive (GTK_WIDGET (object)) + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) +sensitive = TRUE; + object = gtk_builder_get_object (builder, synaptics-scroll-horiz); gtk_widget_set_sensitive (GTK_WIDGET (object), sensitive); } @@ -817,6 +822,8 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, { gint edge_scroll[3] = { 0, 0, 0 }; gint two_scroll[2] = { 0, 0 }; +gint circ_scroll = 0; +gint circ_trigger = 0; GObject *object; gboolean horizontal = FALSE; gchar*name = NULL, *prop; @@ -851,6 +858,18 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, two_scroll[1] = horizontal; } +object = gtk_builder_get_object (builder, synaptics-scroll-circ); +if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) + gtk_widget_get_sensitive (GTK_WIDGET (object))) +{ +circ_scroll = TRUE; +if (horizontal) +{ +circ_trigger = 3; +edge_scroll[1] = TRUE; +} +} + if (mouse_settings_device_get_selected (builder, NULL, name)) { /* 3 values: vertical, horizontal, corner. */ @@ -869,6 +888,16 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, G_TYPE_INT, two_scroll[1], G_TYPE_INVALID); g_free (prop); + +/* 1 value: circular. */ +prop = g_strconcat (/, name, /Properties/Synaptics_Circular_Scrolling, NULL); +xfconf_channel_set_int (pointers_channel, prop, circ_scroll); +g_free (prop); + +/* 1 value: location. */ +prop = g_strconcat (/, name, /Properties/Synaptics_Circular_Scrolling_Trigger, NULL); +xfconf_channel_set_int (pointers_channel, prop, circ_trigger); +g_free (prop); } g_free (name); @@ -934,6 +963,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) Atom synaptics_tap_prop; Atom synaptics_edge_scroll_prop; Atom synaptics_two_scroll_prop; +Atom synaptics_circ_scroll_prop; Atom device_enabled_prop; Atom wacom_rotation_prop; gint is_enabled = -1; @@ -942,6 +972,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) gint synaptics_edge_hscroll = -1; gint synaptics_two_scroll = -1; gint synaptics_two_hscroll = -1; +gint synaptics_circ_scroll = -1; gint wacom_rotation = -1; Atom *props; gint nprops; @@ -1047,6 +1078,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) synaptics_tap_prop = XInternAtom (xdisplay, Synaptics Tap Action, True); synaptics_edge_scroll_prop = XInternAtom (xdisplay, Synaptics Edge Scrolling, True); synaptics_two_scroll_prop = XInternAtom (xdisplay, Synaptics Two-Finger Scrolling, True); +synaptics_circ_scroll_prop = XInternAtom (xdisplay, Synaptics Circular Scrolling, True); wacom_rotation_prop = XInternAtom (xdisplay, Wacom Rotation, True); /* check if this is a synaptics or wacom device */ @@ -1068,6 +1100,8 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) synaptics_edge_scroll = mouse_settings_device_get_int_property (device, props[i], 0, synaptics_edge_hscroll); else if (props[i] == synaptics_two_scroll_prop) synaptics_two_scroll = mouse_settings_device_get_int_property (device, props[i], 0, synaptics_two_hscroll); +else if (props[i] == synaptics_circ_scroll_prop) +synaptics_circ_scroll = mouse_settings_device_get_int_property (device, props[i], 0, NULL); else if (props[i] == wacom_rotation_prop) wacom_rotation
[Xfce4-commits] xfce4-settings:master Changed scrolling mode for touchpads to a combobox.
Updating branch refs/heads/master to a14ce7113757844aecb5dc29ca656aaf7017ef8b (commit) from 267b4df56f48449d2e9c478554053d26ea3eeb0a (commit) commit a14ce7113757844aecb5dc29ca656aaf7017ef8b Author: Peter de Ridder pe...@xfce.org Date: Thu May 3 23:50:01 2012 +0200 Changed scrolling mode for touchpads to a combobox. dialogs/mouse-settings/main.c | 132 ++--- dialogs/mouse-settings/mouse-dialog.glade | 92 +--- 2 files changed, 124 insertions(+), 100 deletions(-) diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c index 5f0707b..f4b475b 100644 --- a/dialogs/mouse-settings/main.c +++ b/dialogs/mouse-settings/main.c @@ -790,22 +790,21 @@ mouse_settings_synaptics_set_tap_to_click (GtkBuilder *builder) static void mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) { +gint active; gboolean sensitive = FALSE; GObject *object; -object = gtk_builder_get_object (builder, synaptics-scroll-edge); +/* Values for active: + * -1 no selection + * 0 disabled + * 1 edge scrolling + * 2 two-finger scrolling + * 3 circular scrolling + */ +object = gtk_builder_get_object (builder, synaptics-scroll); +active = gtk_combo_box_get_active (GTK_COMBO_BOX (object)); if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) -sensitive = TRUE; - -object = gtk_builder_get_object (builder, synaptics-scroll-two); -if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) -sensitive = TRUE; - -object = gtk_builder_get_object (builder, synaptics-scroll-circ); -if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) + active 0) sensitive = TRUE; object = gtk_builder_get_object (builder, synaptics-scroll-horiz); @@ -817,8 +816,8 @@ mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) #ifdef DEVICE_PROPERTIES static void -mouse_settings_synaptics_set_scrolling (GtkWidget *widget, -GtkBuilder *builder) +mouse_settings_synaptics_set_scrolling (GtkComboBox *combobox, +GtkBuilder *builder) { gint edge_scroll[3] = { 0, 0, 0 }; gint two_scroll[2] = { 0, 0 }; @@ -826,41 +825,44 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, gint circ_trigger = 0; GObject *object; gboolean horizontal = FALSE; +gint active; gchar*name = NULL, *prop; if (locked 0) return; -/* skip double event if a radio button is toggled */ -if (GTK_IS_RADIO_BUTTON (widget) - !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) -return; - mouse_settings_synaptics_hscroll_sensitive (builder); object = gtk_builder_get_object (builder, synaptics-scroll-horiz); if (gtk_widget_get_sensitive (GTK_WIDGET (object))) horizontal = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)); -object = gtk_builder_get_object (builder, synaptics-scroll-edge); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +/* Values for active: + * -1 no selection + * 0 disabled + * 1 edge scrolling + * 2 two-finger scrolling + * 3 circular scrolling + */ +object = gtk_builder_get_object (builder, synaptics-scroll); +active = gtk_combo_box_get_active (GTK_COMBO_BOX (object)); +if (!gtk_widget_get_sensitive (GTK_WIDGET (object))) +active = -1; + + +if (active == 1) { edge_scroll[0] = TRUE; edge_scroll[1] = horizontal; } -object = gtk_builder_get_object (builder, synaptics-scroll-two); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +if (active == 2) { two_scroll[0] = TRUE; two_scroll[1] = horizontal; } -object = gtk_builder_get_object (builder, synaptics-scroll-circ); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +if (active == 3) { circ_scroll = TRUE; if (horizontal) @@ -908,6 +910,24 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, #ifdef DEVICE_PROPERTIES static void +mouse_settings_synaptics_set_scroll_horiz (GtkWidget *widget, + GtkBuilder *builder) +{ +GObject *object; + +if (locked 0) +return; + +object = gtk_builder_get_object (builder, synaptics-scroll); + +mouse_settings_synaptics_set_scrolling (GTK_COMBO_BOX (object), builder); +} +#endif + + + +#ifdef
[Xfce4-commits] xfce4-settings:master Merge remote-tracking branch 'origin/peter/circularscrolling'
Updating branch refs/heads/master to 6ae352f5413dfd68d90eeeb0dafa297c19e7f4a0 (commit) from 2db06b91919a8d3cf208a777c20acdbfe4bc533d (commit) commit 6ae352f5413dfd68d90eeeb0dafa297c19e7f4a0 Merge: 2db06b9 a14ce71 Author: Peter de Ridder pe...@xfce.org Date: Thu May 10 23:27:20 2012 +0200 Merge remote-tracking branch 'origin/peter/circularscrolling' commit a14ce7113757844aecb5dc29ca656aaf7017ef8b Author: Peter de Ridder pe...@xfce.org Date: Thu May 3 23:50:01 2012 +0200 Changed scrolling mode for touchpads to a combobox. commit 267b4df56f48449d2e9c478554053d26ea3eeb0a Author: Peter de Ridder pe...@xfce.org Date: Tue May 1 20:50:53 2012 +0200 Added circular scrolling for touchpads. dialogs/mouse-settings/main.c | 146 +--- dialogs/mouse-settings/mouse-dialog.glade | 75 --- 2 files changed, 151 insertions(+), 70 deletions(-) diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c index 86230c5..f4b475b 100644 --- a/dialogs/mouse-settings/main.c +++ b/dialogs/mouse-settings/main.c @@ -790,17 +790,21 @@ mouse_settings_synaptics_set_tap_to_click (GtkBuilder *builder) static void mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) { +gint active; gboolean sensitive = FALSE; GObject *object; -object = gtk_builder_get_object (builder, synaptics-scroll-edge); +/* Values for active: + * -1 no selection + * 0 disabled + * 1 edge scrolling + * 2 two-finger scrolling + * 3 circular scrolling + */ +object = gtk_builder_get_object (builder, synaptics-scroll); +active = gtk_combo_box_get_active (GTK_COMBO_BOX (object)); if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) -sensitive = TRUE; - -object = gtk_builder_get_object (builder, synaptics-scroll-two); -if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) + active 0) sensitive = TRUE; object = gtk_builder_get_object (builder, synaptics-scroll-horiz); @@ -812,45 +816,62 @@ mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) #ifdef DEVICE_PROPERTIES static void -mouse_settings_synaptics_set_scrolling (GtkWidget *widget, -GtkBuilder *builder) +mouse_settings_synaptics_set_scrolling (GtkComboBox *combobox, +GtkBuilder *builder) { gint edge_scroll[3] = { 0, 0, 0 }; gint two_scroll[2] = { 0, 0 }; +gint circ_scroll = 0; +gint circ_trigger = 0; GObject *object; gboolean horizontal = FALSE; +gint active; gchar*name = NULL, *prop; if (locked 0) return; -/* skip double event if a radio button is toggled */ -if (GTK_IS_RADIO_BUTTON (widget) - !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) -return; - mouse_settings_synaptics_hscroll_sensitive (builder); object = gtk_builder_get_object (builder, synaptics-scroll-horiz); if (gtk_widget_get_sensitive (GTK_WIDGET (object))) horizontal = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)); -object = gtk_builder_get_object (builder, synaptics-scroll-edge); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +/* Values for active: + * -1 no selection + * 0 disabled + * 1 edge scrolling + * 2 two-finger scrolling + * 3 circular scrolling + */ +object = gtk_builder_get_object (builder, synaptics-scroll); +active = gtk_combo_box_get_active (GTK_COMBO_BOX (object)); +if (!gtk_widget_get_sensitive (GTK_WIDGET (object))) +active = -1; + + +if (active == 1) { edge_scroll[0] = TRUE; edge_scroll[1] = horizontal; } -object = gtk_builder_get_object (builder, synaptics-scroll-two); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +if (active == 2) { two_scroll[0] = TRUE; two_scroll[1] = horizontal; } +if (active == 3) +{ +circ_scroll = TRUE; +if (horizontal) +{ +circ_trigger = 3; +edge_scroll[1] = TRUE; +} +} + if (mouse_settings_device_get_selected (builder, NULL, name)) { /* 3 values: vertical, horizontal, corner. */ @@ -869,6 +890,16 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, G_TYPE_INT, two_scroll[1], G_TYPE_INVALID); g_free (prop); + +/* 1 value: circular. */ +prop = g_strconcat (/, name, /Properties/Synaptics_Circular_Scrolling, NULL
[Xfce4-commits] xfce4-settings:peter/circularscrolling Changed scrolling mode for touchpads to a combobox.
Updating branch refs/heads/peter/circularscrolling to a14ce7113757844aecb5dc29ca656aaf7017ef8b (commit) from 267b4df56f48449d2e9c478554053d26ea3eeb0a (commit) commit a14ce7113757844aecb5dc29ca656aaf7017ef8b Author: Peter de Ridder pe...@xfce.org Date: Thu May 3 23:50:01 2012 +0200 Changed scrolling mode for touchpads to a combobox. dialogs/mouse-settings/main.c | 132 ++--- dialogs/mouse-settings/mouse-dialog.glade | 92 +--- 2 files changed, 124 insertions(+), 100 deletions(-) diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c index 5f0707b..f4b475b 100644 --- a/dialogs/mouse-settings/main.c +++ b/dialogs/mouse-settings/main.c @@ -790,22 +790,21 @@ mouse_settings_synaptics_set_tap_to_click (GtkBuilder *builder) static void mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) { +gint active; gboolean sensitive = FALSE; GObject *object; -object = gtk_builder_get_object (builder, synaptics-scroll-edge); +/* Values for active: + * -1 no selection + * 0 disabled + * 1 edge scrolling + * 2 two-finger scrolling + * 3 circular scrolling + */ +object = gtk_builder_get_object (builder, synaptics-scroll); +active = gtk_combo_box_get_active (GTK_COMBO_BOX (object)); if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) -sensitive = TRUE; - -object = gtk_builder_get_object (builder, synaptics-scroll-two); -if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) -sensitive = TRUE; - -object = gtk_builder_get_object (builder, synaptics-scroll-circ); -if (gtk_widget_get_sensitive (GTK_WIDGET (object)) - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) + active 0) sensitive = TRUE; object = gtk_builder_get_object (builder, synaptics-scroll-horiz); @@ -817,8 +816,8 @@ mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) #ifdef DEVICE_PROPERTIES static void -mouse_settings_synaptics_set_scrolling (GtkWidget *widget, -GtkBuilder *builder) +mouse_settings_synaptics_set_scrolling (GtkComboBox *combobox, +GtkBuilder *builder) { gint edge_scroll[3] = { 0, 0, 0 }; gint two_scroll[2] = { 0, 0 }; @@ -826,41 +825,44 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, gint circ_trigger = 0; GObject *object; gboolean horizontal = FALSE; +gint active; gchar*name = NULL, *prop; if (locked 0) return; -/* skip double event if a radio button is toggled */ -if (GTK_IS_RADIO_BUTTON (widget) - !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) -return; - mouse_settings_synaptics_hscroll_sensitive (builder); object = gtk_builder_get_object (builder, synaptics-scroll-horiz); if (gtk_widget_get_sensitive (GTK_WIDGET (object))) horizontal = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)); -object = gtk_builder_get_object (builder, synaptics-scroll-edge); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +/* Values for active: + * -1 no selection + * 0 disabled + * 1 edge scrolling + * 2 two-finger scrolling + * 3 circular scrolling + */ +object = gtk_builder_get_object (builder, synaptics-scroll); +active = gtk_combo_box_get_active (GTK_COMBO_BOX (object)); +if (!gtk_widget_get_sensitive (GTK_WIDGET (object))) +active = -1; + + +if (active == 1) { edge_scroll[0] = TRUE; edge_scroll[1] = horizontal; } -object = gtk_builder_get_object (builder, synaptics-scroll-two); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +if (active == 2) { two_scroll[0] = TRUE; two_scroll[1] = horizontal; } -object = gtk_builder_get_object (builder, synaptics-scroll-circ); -if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) - gtk_widget_get_sensitive (GTK_WIDGET (object))) +if (active == 3) { circ_scroll = TRUE; if (horizontal) @@ -908,6 +910,24 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, #ifdef DEVICE_PROPERTIES static void +mouse_settings_synaptics_set_scroll_horiz (GtkWidget *widget, + GtkBuilder *builder) +{ +GObject *object; + +if (locked 0) +return; + +object = gtk_builder_get_object (builder, synaptics-scroll); + +mouse_settings_synaptics_set_scrolling (GTK_COMBO_BOX (object), builder
[Xfce4-commits] xfce4-settings:peter/circularscrolling Creating branch peter/circularscrolling
Updating branch refs/heads/peter/circularscrolling as new branch to 267b4df56f48449d2e9c478554053d26ea3eeb0a (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/peter/circularscrolling for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:peter/circularscrolling Added circular scrolling for touchpads.
Updating branch refs/heads/peter/circularscrolling to 267b4df56f48449d2e9c478554053d26ea3eeb0a (commit) from 03ec008e8407808687f2e8e0b218335dc4653140 (commit) commit 267b4df56f48449d2e9c478554053d26ea3eeb0a Author: Peter de Ridder pe...@xfce.org Date: Tue May 1 20:50:53 2012 +0200 Added circular scrolling for touchpads. dialogs/mouse-settings/main.c | 44 +++- dialogs/mouse-settings/mouse-dialog.glade | 17 +++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c index 86230c5..5f0707b 100644 --- a/dialogs/mouse-settings/main.c +++ b/dialogs/mouse-settings/main.c @@ -803,6 +803,11 @@ mouse_settings_synaptics_hscroll_sensitive (GtkBuilder *builder) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) sensitive = TRUE; +object = gtk_builder_get_object (builder, synaptics-scroll-circ); +if (gtk_widget_get_sensitive (GTK_WIDGET (object)) + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) +sensitive = TRUE; + object = gtk_builder_get_object (builder, synaptics-scroll-horiz); gtk_widget_set_sensitive (GTK_WIDGET (object), sensitive); } @@ -817,6 +822,8 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, { gint edge_scroll[3] = { 0, 0, 0 }; gint two_scroll[2] = { 0, 0 }; +gint circ_scroll = 0; +gint circ_trigger = 0; GObject *object; gboolean horizontal = FALSE; gchar*name = NULL, *prop; @@ -851,6 +858,18 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, two_scroll[1] = horizontal; } +object = gtk_builder_get_object (builder, synaptics-scroll-circ); +if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)) + gtk_widget_get_sensitive (GTK_WIDGET (object))) +{ +circ_scroll = TRUE; +if (horizontal) +{ +circ_trigger = 3; +edge_scroll[1] = TRUE; +} +} + if (mouse_settings_device_get_selected (builder, NULL, name)) { /* 3 values: vertical, horizontal, corner. */ @@ -869,6 +888,16 @@ mouse_settings_synaptics_set_scrolling (GtkWidget *widget, G_TYPE_INT, two_scroll[1], G_TYPE_INVALID); g_free (prop); + +/* 1 value: circular. */ +prop = g_strconcat (/, name, /Properties/Synaptics_Circular_Scrolling, NULL); +xfconf_channel_set_int (pointers_channel, prop, circ_scroll); +g_free (prop); + +/* 1 value: location. */ +prop = g_strconcat (/, name, /Properties/Synaptics_Circular_Scrolling_Trigger, NULL); +xfconf_channel_set_int (pointers_channel, prop, circ_trigger); +g_free (prop); } g_free (name); @@ -934,6 +963,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) Atom synaptics_tap_prop; Atom synaptics_edge_scroll_prop; Atom synaptics_two_scroll_prop; +Atom synaptics_circ_scroll_prop; Atom device_enabled_prop; Atom wacom_rotation_prop; gint is_enabled = -1; @@ -942,6 +972,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) gint synaptics_edge_hscroll = -1; gint synaptics_two_scroll = -1; gint synaptics_two_hscroll = -1; +gint synaptics_circ_scroll = -1; gint wacom_rotation = -1; Atom *props; gint nprops; @@ -1047,6 +1078,7 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) synaptics_tap_prop = XInternAtom (xdisplay, Synaptics Tap Action, True); synaptics_edge_scroll_prop = XInternAtom (xdisplay, Synaptics Edge Scrolling, True); synaptics_two_scroll_prop = XInternAtom (xdisplay, Synaptics Two-Finger Scrolling, True); +synaptics_circ_scroll_prop = XInternAtom (xdisplay, Synaptics Circular Scrolling, True); wacom_rotation_prop = XInternAtom (xdisplay, Wacom Rotation, True); /* check if this is a synaptics or wacom device */ @@ -1068,6 +1100,8 @@ mouse_settings_device_selection_changed (GtkBuilder *builder) synaptics_edge_scroll = mouse_settings_device_get_int_property (device, props[i], 0, synaptics_edge_hscroll); else if (props[i] == synaptics_two_scroll_prop) synaptics_two_scroll = mouse_settings_device_get_int_property (device, props[i], 0, synaptics_two_hscroll); +else if (props[i] == synaptics_circ_scroll_prop) +synaptics_circ_scroll = mouse_settings_device_get_int_property (device, props[i], 0, NULL); else if (props[i] == wacom_rotation_prop
[Xfce4-commits] gtk-xfce-engine:master Added Gtk 3.4 support to the engine
Updating branch refs/heads/master to 39d67c146f82f0bc341cf62918220b3627b2ffa5 (commit) from 1ff854f50179fa83b82502d5d44cbe47f7ee6833 (commit) commit 39d67c146f82f0bc341cf62918220b3627b2ffa5 Author: Peter de Ridder pe...@xfce.org Date: Thu Apr 26 21:51:18 2012 +0200 Added Gtk 3.4 support to the engine Themes are not updated default themes only support Gtk 3.2 gtk-3.0/xfce_engine.c | 80 + 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index acad345..7070c18 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -504,8 +504,16 @@ static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, switch (border_style) { +#if GTK_CHECK_VERSION(3,4,0) +case GTK_BORDER_STYLE_HIDDEN: +#endif case GTK_BORDER_STYLE_NONE: break; +#if GTK_CHECK_VERSION(3,4,0) +case GTK_BORDER_STYLE_DOTTED: +case GTK_BORDER_STYLE_DASHED: +case GTK_BORDER_STYLE_DOUBLE: +#endif case GTK_BORDER_STYLE_SOLID: gdk_cairo_set_source_rgba(cr, dark); if ((xt 1) (yt 1)) @@ -519,6 +527,78 @@ static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, } cairo_stroke(cr); break; +#if GTK_CHECK_VERSION(3,4,0) + case GTK_BORDER_STYLE_GROOVE: +color_dark2light(dark, light); +if ((xt 1) (yt 1)) +{ +gdk_cairo_set_source_rgba(cr, light); +cairo_move_to(cr, x + 0.5, y + height - 0.5); +cairo_line_to(cr, x + width - 0.5, y + height - 0.5); +cairo_line_to(cr, x + width - 0.5, y + 0.5); +cairo_stroke(cr); + +gdk_cairo_set_source_rgba(cr, dark); +cairo_move_to(cr, x + width - 1.5, y + 0.5); +cairo_line_to(cr, x + 0.5, y + 0.5); +cairo_line_to(cr, x + 0.5, y + height - 1.5); +cairo_stroke(cr); + +gdk_cairo_set_source_rgba(cr, light); +cairo_move_to(cr, x + width - 1.5, y + 1.5); +cairo_line_to(cr, x + 1.5, y + 1.5); +cairo_line_to(cr, x + 1.5, y + height - 1.5); +cairo_stroke(cr); + +gdk_cairo_set_source_rgba(cr, dark); +cairo_move_to(cr, x + 1.5, y + height - 1.5); +cairo_line_to(cr, x + width - 1.5, y + height - 1.5); +cairo_line_to(cr, x + width - 1.5, y + 1.5); +cairo_stroke(cr); +} +else if ((xt 0) (yt 0)) +{ +gdk_cairo_set_source_rgba(cr, dark); +cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height - 1); +cairo_stroke(cr); +} +break; + case GTK_BORDER_STYLE_RIDGE: +color_dark2light(dark, light); +if ((xt 1) (yt 1)) +{ +gdk_cairo_set_source_rgba(cr, dark); +cairo_move_to(cr, x + 0.5, y + height - 0.5); +cairo_line_to(cr, x + width - 0.5, y + height - 0.5); +cairo_line_to(cr, x + width - 0.5, y + 0.5); +cairo_stroke(cr); + +gdk_cairo_set_source_rgba(cr, light); +cairo_move_to(cr, x + width - 1.5, y + 0.5); +cairo_line_to(cr, x + 0.5, y + 0.5); +cairo_line_to(cr, x + 0.5, y + height - 1.5); +cairo_stroke(cr); + +gdk_cairo_set_source_rgba(cr, dark); +cairo_move_to(cr, x + width - 1.5, y + 1.5); +cairo_line_to(cr, x + 1.5, y + 1.5); +cairo_line_to(cr, x + 1.5, y + height - 1.5); +cairo_stroke(cr); + +gdk_cairo_set_source_rgba(cr, light); +cairo_move_to(cr, x + 1.5, y + height - 1.5); +cairo_line_to(cr, x + width - 1.5, y + height - 1.5); +cairo_line_to(cr, x + width - 1.5, y + 1.5); +cairo_stroke(cr); +} +else if ((xt 0) (yt 0)) +{ +gdk_cairo_set_source_rgba(cr, light); +cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height - 1); +cairo_stroke(cr); +} +break; +#endif case GTK_BORDER_STYLE_INSET: gtk_theming_engine_get(engine, state, XFCE_SMOOTH_EDGE, smooth_edge, NULL); color_dark2light_mid(dark, light, mid); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Default themes don't support Gtk+-3.4
Updating branch refs/heads/master to ee948e3708492c58ba4d8c52b8cc6320d4c6f02a (commit) from 39d67c146f82f0bc341cf62918220b3627b2ffa5 (commit) commit ee948e3708492c58ba4d8c52b8cc6320d4c6f02a Author: Peter de Ridder pe...@xfce.org Date: Sat Apr 28 11:37:38 2012 +0200 Default themes don't support Gtk+-3.4 README |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README b/README index 62d3d88..f0efd66 100644 --- a/README +++ b/README @@ -2,3 +2,4 @@ This package provides the Xfce Gtk+-2.0 and Gtk+-3.0 engines, which allows for homogeneity in applications for both business and personal desktops. Minimum required Gtk+-2.0 version is currently Gtk+-2.20.0. Minimum required Gtk+-3.0 version is currently Gtk+-3.2.0. +Gtk+-3.4.0 is not supported by the default themes. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Release 3.0.0!
Updating branch refs/heads/master to c48fc413091b4cee27627bd63a60d279521ed3ef (commit) from ee948e3708492c58ba4d8c52b8cc6320d4c6f02a (commit) commit c48fc413091b4cee27627bd63a60d279521ed3ef Author: Peter de Ridder pe...@xfce.org Date: Sat Apr 28 12:09:34 2012 +0200 Release 3.0.0! NEWS| 12 configure.in.in |8 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index c503131..461e030 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +3.0.0 += +- Added px for border sizes. +- Corrected DETAIL names. +- Use the correct colors for options and checks. +- More consistent extension rendering. +- Corrected class matching and alignments. +- Require Gtk 3.2. +- Tuned default theme for Gtk 3.2. +- Added Gtk 3.4 support to the engine. +- Default themes don't support Gtk+-3.4. + 2.99.3 == - Link against libm for floor() and ceil(). diff --git a/configure.in.in b/configure.in.in index e4a05bf..a31eccd 100644 --- a/configure.in.in +++ b/configure.in.in @@ -5,12 +5,12 @@ dnl dnl *** dnl *** Version information *** dnl *** -m4_define([gtk_xfce_engine_version_major], [2]) -m4_define([gtk_xfce_engine_version_minor], [99]) -m4_define([gtk_xfce_engine_version_micro], [3]) +m4_define([gtk_xfce_engine_version_major], [3]) +m4_define([gtk_xfce_engine_version_minor], [0]) +m4_define([gtk_xfce_engine_version_micro], [0]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], [git]) +m4_define([gtk_xfce_engine_version_tag], []) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Post release tag bump.
Updating branch refs/heads/master to c1c38420c532808e92089426ea301fe4ad8441ac (commit) from c48fc413091b4cee27627bd63a60d279521ed3ef (commit) commit c1c38420c532808e92089426ea301fe4ad8441ac Author: Peter de Ridder pe...@xfce.org Date: Sat Apr 28 12:26:46 2012 +0200 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index a31eccd..76eb561 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [0]) m4_define([gtk_xfce_engine_version_micro], [0]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], []) +m4_define([gtk_xfce_engine_version_tag], [git]) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine|gtk-xfce-engine-3.0.0 Creating annotated tag gtk-xfce-engine-3.0.0
Updating annotated tag refs/tags/gtk-xfce-engine-3.0.0 as new annotated tag to f4670d90017465ed6dc67f73af3a9b933f561d50 (tag) succeeds gtk-xfce-engine-2.99.3-10-gee948e3 tagged by Peter de Ridder pe...@xfce.org on 2012-04-28 12:21 +0200 Peter de Ridder (1): Release 3.0.0! ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Corrected DETAIL names
Updating branch refs/heads/master to 0d4b2021503fd0e1ccf106c6d9035bafd55bcdac (commit) from 8820907427c388a7b767feb296ab2a5b8e0ecf1c (commit) commit 0d4b2021503fd0e1ccf106c6d9035bafd55bcdac Author: Peter de Ridder pe...@xfce.org Date: Thu Apr 26 21:03:54 2012 +0200 Corrected DETAIL names gtk-2.0/xfce_theme_draw.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index bef4648..107764d 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -15,7 +15,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Copyright (C) 1999-2004 Olivier Fourdan (four...@xfce.org) - * Copyright (C) 2011 Peter de Ridder (pe...@xfce.org) + * Copyright (C) 2011-2012 Peter de Ridder (pe...@xfce.org) * * Portions based Thinice port by * Tim Gerla t...@rrv.net, @@ -663,7 +663,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_stroke(cr); } } -else if (DETAIL (dockitem_bin) || DETAIL (dockitem) || DETAIL (toolbar)) +else if (DETAIL (handlebox_bin) || DETAIL (handlebox) || DETAIL (toolbar)) { if ((xt 1) (yt 1)) { @@ -695,7 +695,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_stroke(cr); } } -else if (DETAIL(vscrollbar) || DETAIL(hscrollbar) || DETAIL(bar) || DETAIL(slider) || DETAIL(vscale) || DETAIL(hscale)) +else if (DETAIL(vscrollbar) || DETAIL(hscrollbar) || DETAIL(slider) || DETAIL(vscale) || DETAIL(hscale)) { if ((xt 1) (yt 1)) { @@ -736,7 +736,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_stroke(cr); } } -else if (DETAIL(menubar) || DETAIL(frame) || DETAIL(dockitem) || DETAIL(dockitem_bin) || DETAIL(menu) || DETAIL(toolbar)) +else if (DETAIL(frame)) { if ((xt 1) (yt 1)) { @@ -864,7 +864,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_stroke(cr); } } -else if (DETAIL (dockitem_bin) || DETAIL (dockitem) || DETAIL (toolbar)) +else if (DETAIL (handlebox_bin) || DETAIL (handlebox) || DETAIL (toolbar)) { if ((xt 1) (yt 1)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Use the correct colors for options and checks
Updating branch refs/heads/master to dadd9f2e09d8e8287af8b87c7a0a91b59e16940b (commit) from 0d4b2021503fd0e1ccf106c6d9035bafd55bcdac (commit) commit dadd9f2e09d8e8287af8b87c7a0a91b59e16940b Author: Peter de Ridder pe...@xfce.org Date: Thu Apr 26 21:08:01 2012 +0200 Use the correct colors for options and checks gtk-2.0/xfce_theme_draw.c | 25 ++--- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 107764d..89f8d90 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -987,6 +987,7 @@ static void draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state, cairo_t *cr; guint size; guint w, b; +GdkColor * c; CHECK_ARGS; SANITIZE_SIZE; @@ -1023,13 +1024,18 @@ static void draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state, cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); -cairo_rectangle (cr, x + 0.5, y + 0.5, width - 1, height - 1); +cairo_rectangle (cr, x + 0.5, y + 0.5, size - 1, size - 1); if (!DETAIL(check))/* not Menu item */ { /* Draw the background */ gdk_cairo_set_source_color(cr, style-base[state]); cairo_fill_preserve(cr); +c = style-text[state]; +} +else +{ +c = style-fg[state]; } /* Draw the border */ @@ -1046,7 +1052,7 @@ static void draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state, w = ((size + 4 - b) / 6); /* Draw the check */ -gdk_cairo_set_source_color(cr, style-fg[state]); +gdk_cairo_set_source_color(cr, c); cairo_move_to (cr, x + b, y + floor(size / 2 - 1.5)); @@ -1066,8 +1072,7 @@ static void draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state, } else if (shadow == GTK_SHADOW_ETCHED_IN) { -gdk_cairo_set_source_color(cr, style-fg[state]); -draw_dash(cr, style-fg[state], x, y, size); +draw_dash(cr, c, x, y, size); } cairo_destroy(cr); @@ -1077,6 +1082,7 @@ static void draw_option(GtkStyle * style, GdkWindow * window, GtkStateType state { cairo_t *cr; guint size; +GdkColor * c; CHECK_ARGS; SANITIZE_SIZE; @@ -1113,13 +1119,18 @@ static void draw_option(GtkStyle * style, GdkWindow * window, GtkStateType state cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); -cairo_arc (cr, x + (width / 2.0), y + (height / 2.0), width / 2, 0, 2 * M_PI); +cairo_arc (cr, x + (size / 2.0), y + (size / 2.0), (size - 1) / 2.0, 0, 2 * M_PI); if (!DETAIL(option)) /* not Menu item */ { /* Draw the background */ gdk_cairo_set_source_color(cr, style-base[state]); cairo_fill_preserve(cr); +c = style-text[state]; +} +else +{ +c = style-fg[state]; } /* Draw the border */ @@ -1133,14 +1144,14 @@ static void draw_option(GtkStyle * style, GdkWindow * window, GtkStateType state if (shadow == GTK_SHADOW_IN) { /* Draw the dot */ -gdk_cairo_set_source_color(cr, style-fg[state]); +gdk_cairo_set_source_color(cr, c); cairo_arc (cr, x + (size / 2.0), y + (size / 2.0), (size / 2.0) - ((size + 2) / 5), 0, 2 * M_PI); cairo_fill(cr); } else if (shadow == GTK_SHADOW_ETCHED_IN) { -draw_dash(cr, style-fg[state], x, y, size); +draw_dash(cr, c, x, y, size); } cairo_destroy(cr); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master More consisten extension rendering
Updating branch refs/heads/master to b7c22fea65e90fdcef938d55a3e229a966982bf4 (commit) from dadd9f2e09d8e8287af8b87c7a0a91b59e16940b (commit) commit b7c22fea65e90fdcef938d55a3e229a966982bf4 Author: Peter de Ridder pe...@xfce.org Date: Thu Apr 26 21:16:01 2012 +0200 More consisten extension rendering gtk-2.0/xfce_theme_draw.c |2 +- gtk-3.0/xfce_engine.c |9 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 89f8d90..6181356 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -1479,7 +1479,7 @@ static void draw_extension(GtkStyle * style, GdkWindow * window, GtkStateType st CHECK_ARGS; SANITIZE_SIZE; -gtk_style_apply_default_background(style, window, widget !GTK_WIDGET_NO_WINDOW(widget), GTK_STATE_NORMAL, area, x, y, width, height); +gtk_style_apply_default_background(style, window, widget !GTK_WIDGET_NO_WINDOW(widget), state_type, area, x, y, width, height); if (XFCE_RC_STYLE(style-rc_style)-smooth_edge) { diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index e04b146..d71ea06 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -373,7 +373,12 @@ static void render_background(GtkThemingEngine * engine, cairo_t * cr, gdouble x xt = MIN(xthick, width - 1); yt = MIN(ythick, height - 1); -if(smooth_edge gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_PROGRESSBAR)) +if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_NOTEBOOK)) +{ +xt = 0; +yt = 0; +} +else if (smooth_edge gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_PROGRESSBAR)) { xt = 1; yt = 1; @@ -1467,7 +1472,7 @@ static void render_extension(GtkThemingEngine * engine, cairo_t * cr, gdouble x, state = gtk_theming_engine_get_state(engine); gtk_theming_engine_get_border(engine, state, border); -GTK_THEMING_ENGINE_GET_CLASS(engine)-render_background(engine, cr, x - border.left + 1, y - border.top + 1, width + border.left + border.right - 2, height + border.top + border.bottom - 2); +GTK_THEMING_ENGINE_GET_CLASS(engine)-render_background(engine, cr, x, y, width, height); gtk_theming_engine_get(engine, state, XFCE_SMOOTH_EDGE, smooth_edge, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Corrected class matching and alignments
Updating branch refs/heads/master to 4da9c7e410eeb1897385f8c0c481b749324fa280 (commit) from b7c22fea65e90fdcef938d55a3e229a966982bf4 (commit) commit 4da9c7e410eeb1897385f8c0c481b749324fa280 Author: Peter de Ridder pe...@xfce.org Date: Thu Apr 26 21:18:12 2012 +0200 Corrected class matching and alignments gtk-3.0/xfce_engine.c | 53 - 1 files changed, 39 insertions(+), 14 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index d71ea06..acad345 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -306,6 +306,9 @@ static void render_line(GtkThemingEngine * engine, cairo_t * cr, gdouble x1, gdo x1 += 1 + thickness_dark - thickness_light; y_2 += 1; +y_1 = floor(y_1); +y_2 = floor(y_2); + cairo_set_line_width (cr, thickness_dark); gdk_cairo_set_source_rgba(cr, dark); cairo_move_to(cr, x1 - (thickness_dark / 2.0), y_1); @@ -327,6 +330,9 @@ static void render_line(GtkThemingEngine * engine, cairo_t * cr, gdouble x1, gdo y_1 += 1 + thickness_dark - thickness_light; x2 += 1; +x1 = floor(x1); +x2 = floor(x2); + cairo_set_line_width (cr, thickness_dark); gdk_cairo_set_source_rgba(cr, dark); cairo_move_to(cr, x1, y_1 - (thickness_dark / 2.0)); @@ -378,7 +384,8 @@ static void render_background(GtkThemingEngine * engine, cairo_t * cr, gdouble x xt = 0; yt = 0; } -else if (smooth_edge gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_PROGRESSBAR)) +else if ((smooth_edge gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_PROGRESSBAR)) || + (smooth_edge gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TROUGH))) { xt = 1; yt = 1; @@ -386,10 +393,20 @@ static void render_background(GtkThemingEngine * engine, cairo_t * cr, gdouble x else { xt = MIN(xt, 2); -yt = MIN(yt, 2); +xt = MIN(xt, yt); +yt = xt; } -cairo_rectangle(cr, xt, yt, width - xt * 2, height - yt * 2); +/* The menubar only draws a bottom line */ +if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR) +!gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM)) +{ +cairo_rectangle(cr, 0, 0, width, height - yt); +} +else +{ +cairo_rectangle(cr, xt, yt, width - xt * 2, height - yt * 2); +} if(pattern) { @@ -444,14 +461,14 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo /* Draw an inset border around the default border */ gtk_theming_engine_get(engine, state, XFCE_BUTTON_DEFAULT_BORDER, default_border, NULL); - if (default_border +if (default_border (default_border-left xt) (default_border-right xt) - (default_border-top yt) (default_border-bottom yt)) - { +(default_border-top yt) (default_border-bottom yt)) +{ xfce_draw_frame(engine, cr, x - default_border-left, y - default_border-top, width + default_border-left + default_border-right, height + default_border-top + default_border-bottom, GTK_BORDER_STYLE_INSET); - } +} gtk_border_free(default_border); } @@ -507,9 +524,19 @@ static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, color_dark2light_mid(dark, light, mid); if (smooth_edge) { -if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TROUGH)) +if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TROUGH) !gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCALE)) { -/* Do nothing */ +gtk_theming_engine_get_background_color(engine, state, bg); +gdk_cairo_set_source_rgba(cr, bg); +cairo_rectangle(cr, x + 0.5, y + 0.5, width - 1, height - 1); +cairo_stroke(cr); + +gdk_cairo_set_source_rgba(cr, mid); +cairo_rectangle(cr, x, y, 1, 1); +cairo_rectangle(cr, x + width - 1, y, 1, 1); +cairo_rectangle(cr, x, y + height - 1, 1, 1); +cairo_rectangle(cr, x + width - 1, y + height - 1, 1, 1); +cairo_fill(cr); } else if ((xt 1) (yt 1)) { @@ -571,7 +598,6 @@ static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, { if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TROUGH)) { -gtk_theming_engine_get_border_color(engine, GTK_STATE_FLAG_ACTIVE, dark); gdk_cairo_set_source_rgba(cr, dark
[Xfce4-commits] gtk-xfce-engine:master Require Gtk 3.2
Updating branch refs/heads/master to c4324b7d8947482239a6479113d2570b8a39399c (commit) from 4da9c7e410eeb1897385f8c0c481b749324fa280 (commit) commit c4324b7d8947482239a6479113d2570b8a39399c Author: Peter de Ridder pe...@xfce.org Date: Thu Apr 26 21:20:06 2012 +0200 Require Gtk 3.2 For parsing of the provided css files Gtk 3.2 is required. README |2 +- configure.in.in |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index d738b8d..62d3d88 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ This package provides the Xfce Gtk+-2.0 and Gtk+-3.0 engines, which allows for homogeneity in applications for both business and personal desktops. Minimum required Gtk+-2.0 version is currently Gtk+-2.20.0. -Minimum required Gtk+-3.0 version is currently Gtk+-3.0.0. +Minimum required Gtk+-3.0 version is currently Gtk+-3.2.0. diff --git a/configure.in.in b/configure.in.in index 46b8ad6..e4a05bf 100644 --- a/configure.in.in +++ b/configure.in.in @@ -21,7 +21,7 @@ m4_define([gtk_xfce_engine_debug_default], [ifelse(gtk_xfce_engine_version_tag() dnl *** dnl *** Initialize autoconf *** dnl *** -AC_COPYRIGHT([Copyright (c) 2002-2011 The Xfce development team. All rights reserved.]) +AC_COPYRIGHT([Copyright (c) 2002-2012 The Xfce development team. All rights reserved.]) AC_INIT([gtk-xfce-engine], [gtk_xfce_engine_version], [http://bugzilla.xfce.org/]) AC_PREREQ([2.50]) AC_REVISION([gtk_xfce_engine_version_build]) @@ -64,7 +64,7 @@ dnl *** dnl *** Check for optional packages *** dnl *** XDT_CHECK_OPTIONAL_PACKAGE([GTK2], [gtk+-2.0], [2.20.0], [gtk2], [Gtk 2 theme engine]) -XDT_CHECK_OPTIONAL_PACKAGE([GTK3], [gtk+-3.0], [3.0.0], [gtk3], [Gtk 3 theme engine]) +XDT_CHECK_OPTIONAL_PACKAGE([GTK3], [gtk+-3.0], [3.2.0], [gtk3], [Gtk 3 theme engine]) GTK_SUBDIRS= if test x$GTK2_FOUND = xyes ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Tuned default theme for Gtk 3.2
Updating branch refs/heads/master to 1ff854f50179fa83b82502d5d44cbe47f7ee6833 (commit) from c4324b7d8947482239a6479113d2570b8a39399c (commit) commit 1ff854f50179fa83b82502d5d44cbe47f7ee6833 Author: Peter de Ridder pe...@xfce.org Date: Thu Apr 26 21:21:53 2012 +0200 Tuned default theme for Gtk 3.2 Xfce themes/xfce/gtk-3.0/gtk.css | 62 +++ 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/themes/xfce/gtk-3.0/gtk.css b/themes/xfce/gtk-3.0/gtk.css index f3d0424..83489ac 100644 --- a/themes/xfce/gtk-3.0/gtk.css +++ b/themes/xfce/gtk-3.0/gtk.css @@ -73,6 +73,7 @@ -GtkScrollbar-has-backward-stepper: true; -GtkScrollbar-min-slider-length : 20; +-GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolbar-internal-padding : 0; -GtkToolbar-space-size : 10; @@ -203,6 +204,10 @@ GtkCalendar:selected { background-color: @base_active; } +GtkCalendar.button, GtkCalendar.button:active, GtkCalendar.button:insensitive, GtkCalendar.button:hover, GtkCalendar.button:selected { +background-image: none; +} + .check, .radio { color: @text_normal; background-color: @base_normal; @@ -235,20 +240,10 @@ GtkCalendar:selected { border-color: darker(@bg_active); } -.check:inconsistent, .radio:inconsistent { -color: @fg_normal; -background-color: @base_normal; -border-color: darker(@bg_normal); -} - -.check:insensitive:inconsistent, .radio:insensitive:inconsistent { -color: @fg_insensitive; -background-color: @base_insensitive; -border-color: darker(@bg_insensitive); -} - .cell { color: @text_normal; + +border-width: 0px 0px; } .cell:active { @@ -292,12 +287,15 @@ GtkCalendar:selected { background-color: @bg_selected; } +GtkProgressBar { +border-width: 0px 0px; +padding: 0px; +} + .progressbar { color: #4e9a06; background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9))); border-color: darker(#cce2ff); - -border-width: 0px 0px; } .progressbar.vertical { @@ -305,6 +303,7 @@ GtkCalendar:selected { } .trough { +background-color: #e8e8e6; background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1))); border-color: darker(#e8e8e6); } @@ -313,12 +312,19 @@ GtkCalendar:selected { background-image: -gtk-gradient(linear, left top, right top, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1))); } +.scrollbar.trough { +background-color: #d9d7d6; + +border-width: 2px 2px; +} + .notebook { color: #101010; background-color: #ff; border-color: darker(#ff); border-width: 1px 1px; +padding: 1px; } .notebook tab, .notebook tab * { @@ -375,7 +381,8 @@ GtkComboBox .button { background-color: #fafaf7; border-color: darker(#fafaf7); -border-width: 1px 1px; +border-width: 2px 1px; +padding: 2px 1px; } .menu:active, .memuitem:active { @@ -413,7 +420,11 @@ GtkComboBox .button { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ec, 1.0)), to(shade(#ec, 0.9))); border-color: darker(#ec); -border-width: 1px 2px; +border-width: 2px 1px; +} + +.menubar * { +padding: 2px 3px; } .menubar:active { @@ -434,7 +445,7 @@ GtkComboBox .button { } .button { -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ec, 1.1)), to(shade(#ec, 0.95))); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ec, 1.1)), to(shade(#ec, 0.9))); border-color: darker(#ec); -GtkWidget-focus-line-pattern: \0; @@ -442,24 +453,24 @@ GtkComboBox .button { .button:active { color: #00; -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 0.95)), to(shade(#d3d7cf, 1.1))); -border-color: darker(#d3d7cf); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d9d7d6, 0.9)), to(shade(#d9d7d6, 1.1))); +border-color: darker(#d9d7d6); } .button:insensitive { -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95))); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.9))); border-color: darker(@bg_insensitive); } .button:hover { -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.95))); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9))); border-color: darker(#cce2ff); } .button:selected { color: #ff; -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#3465a4, 0.95)), to(shade(#3465a4
[Xfce4-commits] gtk-xfce-engine:master Added px for border sizes
Updating branch refs/heads/master to 8820907427c388a7b767feb296ab2a5b8e0ecf1c (commit) from c16155f07c803c1a21c12ffba293b792c1e34635 (commit) commit 8820907427c388a7b767feb296ab2a5b8e0ecf1c Author: Peter de Ridder pe...@xfce.org Date: Tue Apr 17 20:23:47 2012 +0200 Added px for border sizes themes/b5/gtk-3.0/gtk.css|8 themes/basic/gtk-3.0/gtk.css | 10 +- themes/cadmium/gtk-3.0/gtk.css |8 themes/curve/gtk-3.0/gtk.css | 12 ++-- themes/dawn/gtk-3.0/gtk.css | 12 ++-- themes/dusk/gtk-3.0/gtk.css | 12 ++-- themes/kde2/gtk-3.0/gtk.css | 12 ++-- themes/kolors/gtk-3.0/gtk.css| 18 +- themes/light/gtk-3.0/gtk.css |8 themes/orange/gtk-3.0/gtk.css| 10 +- themes/redmondxp/gtk-3.0/gtk.css | 18 +- themes/saltlake/gtk-3.0/gtk.css |8 themes/smooth/gtk-3.0/gtk.css|8 themes/stellar/gtk-3.0/gtk.css |6 +++--- themes/winter/gtk-3.0/gtk.css| 16 themes/xfce-4.0/gtk-3.0/gtk.css | 24 themes/xfce-4.2/gtk-3.0/gtk.css | 12 ++-- themes/xfce-4.4/gtk-3.0/gtk.css | 12 ++-- themes/xfce-4.6/gtk-3.0/gtk.css | 14 +++--- themes/xfce/gtk-3.0/gtk.css | 14 +++--- 20 files changed, 121 insertions(+), 121 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index 2cbc457..ac1ea3f 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -295,15 +295,15 @@ GtkCalendar:selected { } GtkComboBox { -padding: 0; +padding: 0px; } GtkComboBox .button { -padding: 1; +padding: 1px; } .menuitem { -border-width: 2 2; +border-width: 2px 2px; } .menuitem:hover { @@ -313,7 +313,7 @@ GtkComboBox .button { .slider { color: #525051; -border-width: 1 1; +border-width: 1px 1px; } .slider:active { diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css index 42b6b3b..65910ab 100644 --- a/themes/basic/gtk-3.0/gtk.css +++ b/themes/basic/gtk-3.0/gtk.css @@ -22,15 +22,15 @@ } GtkComboBox { -padding: 0; +padding: 0px; } GtkComboBox .button { -padding: 1; +padding: 1px; } .button { -border-width: 2 2; +border-width: 2px 2px; background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#DCDAD5, 1.1)), to(shade(#DCDAD5, 1.0))); } @@ -52,9 +52,9 @@ GtkComboBox .button { } .menuitem { -border-width: 0 0; +border-width: 0px 0px; } .scrollbar, .scale { -border-width: 2 2; +border-width: 2px 2px; } diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css index ef66016..4675576 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -47,7 +47,7 @@ -GtkToolbar-shadow-type : out; -GtkWidget-interior-focus: true; -border-width: 2 2; +border-width: 2px 2px; color: @fg_normal; background-color: @bg_normal; @@ -307,11 +307,11 @@ GtkCalendar:selected { } GtkComboBox { -padding: 0; +padding: 0px; } GtkComboBox .button { -padding: 1; +padding: 1px; } .dock, .menubar, .toolbar { @@ -356,7 +356,7 @@ GtkComboBox .button { } .menuitem { -border-width: 1 1; +border-width: 1px 1px; background-image: none; } diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css index d89a495..54fdf8b 100644 --- a/themes/curve/gtk-3.0/gtk.css +++ b/themes/curve/gtk-3.0/gtk.css @@ -44,7 +44,7 @@ -GtkWidget-focus-line-width : 1; -GtkWidget-interior-focus: false; -border-width: 2 2; +border-width: 2px 2px; color: @fg_normal; background-color: @bg_normal; @@ -254,7 +254,7 @@ GtkCalendar:selected { .progressbar { -xfce-smooth-edge: false; -border-width: 1 1; +border-width: 1px 1px; color: #ff; background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.8))); @@ -264,7 +264,7 @@ GtkCalendar:selected { .trough { -xfce-smooth-edge: false; -border-width: 1 1; +border-width: 1px 1px; color: #ff; background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8))); @@ -274,7 +274,7 @@ GtkCalendar:selected { .trough.scale, .trough.scrollbar { -xfce-smooth-edge: true; -border-width: 2 2; +border-width: 2px 2px; background-color: @bg_active; background-image: none; @@ -319,11 +319,11 @@ GtkCalendar:selected { } GtkComboBox { -padding: 0; +padding: 0px; } GtkComboBox .button { -padding: 1; +padding: 1px; } .dock:hover .toolbar:hover { diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk
[Xfce4-commits] gtk-xfce-engine:master Link against libm for floor() and ceil()
Updating branch refs/heads/master to 8e816c51b4e405188b3d92f9580ce4142c7b05c6 (commit) from f624005960e8cfe24cbddd2c717a84e22f657227 (commit) commit 8e816c51b4e405188b3d92f9580ce4142c7b05c6 Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Sun Apr 8 17:45:18 2012 +0200 Link against libm for floor() and ceil() configure.in.in |6 +++--- gtk-2.0/Makefile.am |3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.in.in b/configure.in.in index 4aaa4f2..72934fb 100644 --- a/configure.in.in +++ b/configure.in.in @@ -56,6 +56,9 @@ dnl *** Check for required packages *** dnl *** AM_PATH_GLIB_2_0([2.24.0]) XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) +dnl libm is needed for floor() and ceil() +AC_CHECK_LIBM +AC_SUBST(LIBM) dnl *** dnl *** Check for optional packages *** @@ -75,9 +78,6 @@ then GTK3_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` AC_SUBST([GTK3_BINARY_VERSION]) GTK_SUBDIRS=$GTK_SUBDIRS gtk-3.0 - dnl libm is needed for floor() and ceil() - AC_CHECK_LIBM - AC_SUBST(LIBM) fi AC_SUBST([GTK_SUBDIRS]) diff --git a/gtk-2.0/Makefile.am b/gtk-2.0/Makefile.am index 6311eed..003ef8d 100644 --- a/gtk-2.0/Makefile.am +++ b/gtk-2.0/Makefile.am @@ -30,7 +30,8 @@ libxfce_la_CFLAGS = \ libxfce_la_LIBADD = \ $(GTK2_LIBS) \ $(GLIB_LIBS) \ - $(GMODULE_LIBS) + $(GMODULE_LIBS) \ + $(LIBM) libxfce_la_LDFLAGS = \ -module \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Reduce GtkComboBox padding (bug #8455)
Updating branch refs/heads/master to 34291902cdf4432dd68ad6fed3b41757bb046a01 (commit) from 8e816c51b4e405188b3d92f9580ce4142c7b05c6 (commit) commit 34291902cdf4432dd68ad6fed3b41757bb046a01 Author: Peter de Ridder pe...@xfce.org Date: Sun Apr 8 18:39:22 2012 +0200 Reduce GtkComboBox padding (bug #8455) themes/b5/gtk-3.0/gtk.css|8 themes/basic/gtk-3.0/gtk.css |8 themes/cadmium/gtk-3.0/gtk.css |8 themes/curve/gtk-3.0/gtk.css |8 themes/dawn/gtk-3.0/gtk.css |8 themes/dusk/gtk-3.0/gtk.css |8 themes/kde2/gtk-3.0/gtk.css |8 themes/kolors/gtk-3.0/gtk.css|8 themes/light/gtk-3.0/gtk.css |8 themes/orange/gtk-3.0/gtk.css|8 themes/redmondxp/gtk-3.0/gtk.css |8 themes/saltlake/gtk-3.0/gtk.css |8 themes/smooth/gtk-3.0/gtk.css|8 themes/stellar/gtk-3.0/gtk.css |8 themes/winter/gtk-3.0/gtk.css|8 themes/xfce-4.0/gtk-3.0/gtk.css |8 themes/xfce-4.2/gtk-3.0/gtk.css |8 themes/xfce-4.4/gtk-3.0/gtk.css |8 themes/xfce-4.6/gtk-3.0/gtk.css |8 themes/xfce/gtk-3.0/gtk.css |8 20 files changed, 160 insertions(+), 0 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index e3984ac..2cbc457 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -294,6 +294,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .menuitem { border-width: 2 2; } diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css index 9c8ed0d..42b6b3b 100644 --- a/themes/basic/gtk-3.0/gtk.css +++ b/themes/basic/gtk-3.0/gtk.css @@ -21,6 +21,14 @@ text-shadow: 1 1 white; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .button { border-width: 2 2; diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css index e1aa2d3..ef66016 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -306,6 +306,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .dock, .menubar, .toolbar { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.05)), to(shade(@bg_normal, 0.95))); } diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css index 26b1679..d89a495 100644 --- a/themes/curve/gtk-3.0/gtk.css +++ b/themes/curve/gtk-3.0/gtk.css @@ -318,6 +318,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .dock:hover .toolbar:hover { color: #ff; background-color: #4464ac; diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css index 9b40227..b10bfe2 100644 --- a/themes/dawn/gtk-3.0/gtk.css +++ b/themes/dawn/gtk-3.0/gtk.css @@ -322,6 +322,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .button, .slider.horizontal { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 1.0))); diff --git a/themes/dusk/gtk-3.0/gtk.css b/themes/dusk/gtk-3.0/gtk.css index 2891f3d..20cdec0 100644 --- a/themes/dusk/gtk-3.0/gtk.css +++ b/themes/dusk/gtk-3.0/gtk.css @@ -313,6 +313,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .radio { -GtkCheckButton-indicator-size: 10; } diff --git a/themes/kde2/gtk-3.0/gtk.css b/themes/kde2/gtk-3.0/gtk.css index 6605da0..c1ef298 100644 --- a/themes/kde2/gtk-3.0/gtk.css +++ b/themes/kde2/gtk-3.0/gtk.css @@ -299,6 +299,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .dock, .menubar, .toolbar { border-width: 3 3; } diff --git a/themes/kolors/gtk-3.0/gtk.css b/themes/kolors/gtk-3.0/gtk.css index e0fe63c..1abc7a1 100644 --- a/themes/kolors/gtk-3.0/gtk.css +++ b/themes/kolors/gtk-3.0/gtk.css @@ -330,6 +330,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox .button { +padding: 1; +} + .dock, .menubar, .toolbar { border-width: 1 2; } diff --git a/themes/light/gtk-3.0/gtk.css b/themes/light/gtk-3.0/gtk.css index aef787f..02dd377 100644 --- a/themes/light/gtk-3.0/gtk.css +++ b/themes/light/gtk-3.0/gtk.css @@ -296,6 +296,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +GtkComboBox { +padding: 0; +} + +GtkComboBox
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Set -xfce-button-default-border (bug #8454)
Updating branch refs/heads/peter/gtk3 to 955dd154a2a28d209f1cb35bd6c1c7e556c6afc0 (commit) from 8e0ab26b57e5d87b7434ac3045946c07a37dff03 (commit) commit 955dd154a2a28d209f1cb35bd6c1c7e556c6afc0 Author: Peter de Ridder pe...@xfce.org Date: Thu Mar 29 21:37:37 2012 +0200 Set -xfce-button-default-border (bug #8454) Xfce-stellar themes/stellar/gtk-3.0/gtk.css |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/themes/stellar/gtk-3.0/gtk.css b/themes/stellar/gtk-3.0/gtk.css index d9fdea2..04e48b3 100644 --- a/themes/stellar/gtk-3.0/gtk.css +++ b/themes/stellar/gtk-3.0/gtk.css @@ -31,6 +31,7 @@ -GtkButton-default-border: 5; -GtkButton-default-outside-border: 6; +-xfce-button-default-border : 5; -GtkWidget-focus-padding : 0; -GtkCheckButton-indicator-size : 15; -GtkRange-slider-width : 12; @@ -75,6 +76,10 @@ border-color: darker(@bg_selected); } +*:focus { +-xfce-button-default-border: 7; +} + .view, .entry { color: @text_normal; background-color: @base_normal; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Draw inset border around default button (bug #8454)
Updating branch refs/heads/peter/gtk3 to 8e0ab26b57e5d87b7434ac3045946c07a37dff03 (commit) from ad461c453a0415d8781280a857397639a8190271 (commit) commit 8e0ab26b57e5d87b7434ac3045946c07a37dff03 Author: Peter de Ridder pe...@xfce.org Date: Mon Mar 26 23:39:27 2012 +0200 Draw inset border around default button (bug #8454) Gtk 3 doesn't draw a inset border around the default button when -GtkButton-default-border is set. With -xfce-button-default-border this border will be drawn. gtk-3.0/xfce_engine.c | 70 +--- 1 files changed, 59 insertions(+), 11 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index c2231e4..e04b146 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -15,7 +15,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Copyright (C) 1999-2004 Olivier Fourdan (four...@xfce.org) - * Copyright (C) 2011 Peter de Ridder (pe...@xfce.org) + * Copyright (C) 2011-2012 Peter de Ridder (pe...@xfce.org) * * Portions based Thinice port by * Tim Gerla t...@rrv.net, @@ -57,6 +57,9 @@ #define GRIP_STYLE grip-style #define XFCE_GRIP_STYLE -XFCE_NAMESPACE-GRIP_STYLE +#define BUTTON_DEFAULT_BORDER button-default-border +#define XFCE_BUTTON_DEFAULT_BORDER -XFCE_NAMESPACE-BUTTON_DEFAULT_BORDER + /* macros to make sure that things are sane ... */ #define GE_CAIRO_INIT \ cairo_set_line_width (cr, 1.0); \ @@ -70,6 +73,7 @@ G_DEFINE_DYNAMIC_TYPE(XfceEngine, xfce_engine, GTK_TYPE_THEMING_ENGINE) /* internal functions */ static void xfce_draw_grips(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height, GtkOrientation orientation); +static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height, GtkBorderStyle border_style); static void render_line(GtkThemingEngine * engine, cairo_t * cr, gdouble x1, gdouble y1, gdouble x2, gdouble y2); static void render_background(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height); @@ -409,13 +413,58 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo gint xthick, ythick; GtkStateFlags state; GtkBorderStyle border_style; +GtkBorder border; +GtkBorder *default_border; + +state = gtk_theming_engine_get_state(engine); +gtk_theming_engine_get(engine, state, GTK_STYLE_PROPERTY_BORDER_STYLE, border_style, NULL); + +xthick = border.left; +ythick = border.top; + +xt = MIN(xthick, width - 1); +yt = MIN(ythick, height - 1); + +/* Spin buttons are a special case */ +if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SPINBUTTON) gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_BUTTON)) +{ +/* Draw an outset border when hovering a spinner button */ +if (!(state GTK_STATE_FLAG_ACTIVE)) +border_style = GTK_BORDER_STYLE_OUTSET; +} + +/* Default buttons are a special case */ +if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_BUTTON) gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_DEFAULT)) +{ +/* Draw an inset border around the default border */ +gtk_theming_engine_get(engine, state, XFCE_BUTTON_DEFAULT_BORDER, default_border, NULL); + + if (default_border +(default_border-left xt) (default_border-right xt) + (default_border-top yt) (default_border-bottom yt)) + { +xfce_draw_frame(engine, cr, x - default_border-left, y - default_border-top, +width + default_border-left + default_border-right, height + default_border-top + default_border-bottom, +GTK_BORDER_STYLE_INSET); + } + +gtk_border_free(default_border); +} + +xfce_draw_frame(engine, cr, x, y, width, height, border_style); +} + +static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height, GtkBorderStyle border_style) +{ +gint xt, yt; +gint xthick, ythick; +GtkStateFlags state; GdkRGBA dark, light, mid, bg; GdkRGBA black = {0.0, 0.0, 0.0, 1.0}; /* black */ gboolean smooth_edge; GtkBorder border; state = gtk_theming_engine_get_state(engine); -gtk_theming_engine_get(engine, state, GTK_STYLE_PROPERTY_BORDER_STYLE, border_style, NULL); if (border_style == GTK_BORDER_STYLE_NONE) return; @@ -428,14 +477,6 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo xthick = border.left; ythick = border.top; -/* Spin buttons are a special case */ -if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SPINBUTTON) gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_BUTTON
[Xfce4-commits] gtk-xfce-engine:master Correctly match gtk-tooltip widgets (bug #8494)
Updating branch refs/heads/master to 3765a80cf3acd1e63f3207bc0b873ffcab6ef78c (commit) from 3986032f9ebdde4d6c8d4df65bc1446495da0ce2 (commit) commit 3765a80cf3acd1e63f3207bc0b873ffcab6ef78c Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 25 10:43:58 2012 +0200 Correctly match gtk-tooltip widgets (bug #8494) themes/orange/gtk-2.0/gtkrc |2 +- themes/xfce-4.4/gtk-2.0/gtkrc |2 +- themes/xfce-4.6/gtk-2.0/gtkrc |2 +- themes/xfce/gtk-2.0/gtkrc |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/orange/gtk-2.0/gtkrc b/themes/orange/gtk-2.0/gtkrc index eba6a42..713906f 100644 --- a/themes/orange/gtk-2.0/gtkrc +++ b/themes/orange/gtk-2.0/gtkrc @@ -293,7 +293,7 @@ class *GtkVScale*style scale widget_class *.GtkProgress* style progress class *.GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox diff --git a/themes/xfce-4.4/gtk-2.0/gtkrc b/themes/xfce-4.4/gtk-2.0/gtkrc index dc676a0..879c95d 100644 --- a/themes/xfce-4.4/gtk-2.0/gtkrc +++ b/themes/xfce-4.4/gtk-2.0/gtkrc @@ -339,7 +339,7 @@ class *GtkVScale*style scale widget_class *GtkProgress* style progress class *GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox diff --git a/themes/xfce-4.6/gtk-2.0/gtkrc b/themes/xfce-4.6/gtk-2.0/gtkrc index fe39654..9f7d131 100644 --- a/themes/xfce-4.6/gtk-2.0/gtkrc +++ b/themes/xfce-4.6/gtk-2.0/gtkrc @@ -388,7 +388,7 @@ class *GtkVScale*style scale widget_class *GtkProgress* style progress class *GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox diff --git a/themes/xfce/gtk-2.0/gtkrc b/themes/xfce/gtk-2.0/gtkrc index e533aab..b2a33e0 100644 --- a/themes/xfce/gtk-2.0/gtkrc +++ b/themes/xfce/gtk-2.0/gtkrc @@ -388,7 +388,7 @@ class *GtkVScale*style scale widget_class *GtkProgress* style progress class *GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Improved menu theming
Updating branch refs/heads/master to 3986032f9ebdde4d6c8d4df65bc1446495da0ce2 (commit) from 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit) commit 3986032f9ebdde4d6c8d4df65bc1446495da0ce2 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 19 15:26:41 2012 +0100 Improved menu theming themes/b5/gtk-3.0/gtk.css|9 - themes/basic/gtk-3.0/gtk.css |4 themes/cadmium/gtk-3.0/gtk.css |9 +++-- themes/curve/gtk-3.0/gtk.css | 10 +++--- themes/dawn/gtk-3.0/gtk.css |7 +-- themes/dusk/gtk-3.0/gtk.css |7 +-- themes/kde2/gtk-3.0/gtk.css |5 - themes/kolors/gtk-3.0/gtk.css|9 - themes/light/gtk-3.0/gtk.css |8 +++- themes/orange/gtk-3.0/gtk.css| 14 ++ themes/redmondxp/gtk-3.0/gtk.css | 34 -- themes/saltlake/gtk-3.0/gtk.css |3 +++ themes/smooth/gtk-3.0/gtk.css|8 +++- themes/stellar/gtk-3.0/gtk.css |5 ++--- themes/winter/gtk-3.0/gtk.css| 12 +--- themes/xfce-4.0/gtk-3.0/gtk.css |8 ++-- themes/xfce-4.2/gtk-3.0/gtk.css | 12 themes/xfce-4.4/gtk-3.0/gtk.css |9 ++--- themes/xfce-4.6/gtk-3.0/gtk.css | 20 ++-- themes/xfce/gtk-3.0/gtk.css | 20 ++-- 20 files changed, 138 insertions(+), 75 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index 6b386e7..e3984ac 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -34,7 +34,6 @@ -GtkWidget-focus-padding : 0; -GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; --GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 11; -GtkRange-stepper-size : 11; -GtkRange-stepper-spacing: 0; @@ -295,6 +294,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +.menuitem { +border-width: 2 2; +} + +.menuitem:hover { +border-style: outset; +} + .slider { color: #525051; diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css index a9850ae..9c8ed0d 100644 --- a/themes/basic/gtk-3.0/gtk.css +++ b/themes/basic/gtk-3.0/gtk.css @@ -43,6 +43,10 @@ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4B6983, 1.0)), to(shade(#4B6983, 1.1))); } +.menuitem { +border-width: 0 0; +} + .scrollbar, .scale { border-width: 2 2; } diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css index eed815c..e1aa2d3 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -318,7 +318,7 @@ GtkCalendar:selected { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95))); } -.dock:hover, .menubar:hover, .toolbar:hover { +.dock:hover, .toolbar:hover { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.05)), to(shade(@bg_prelight, 0.95))); } @@ -348,7 +348,12 @@ GtkCalendar:selected { } .menuitem { -border-width: 1 2; +border-width: 1 1; +background-image: none; +} + +.menuitem:hover { +border-style: solid; } .slider.vertical, .progressbar.vertical { diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css index c80e03e..26b1679 100644 --- a/themes/curve/gtk-3.0/gtk.css +++ b/themes/curve/gtk-3.0/gtk.css @@ -33,7 +33,6 @@ -GtkWidget-focus-padding : 0; -GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; --GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 15; -GtkRange-stepper-size : 15; -GtkRange-stepper-spacing: 0; @@ -319,7 +318,7 @@ GtkCalendar:selected { border-color: @fg_selected; } -.dock:hover, .menubar:hover, .toolbar:hover { +.dock:hover .toolbar:hover { color: #ff; background-color: #4464ac; border-color: darker(#4464ac); @@ -341,8 +340,13 @@ GtkCalendar:selected { .menuitem:hover { color: #ff; -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.0))); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.8))); border-color: darker(#4464ac); +border-style: outset; +} + +.menuitem *:hover { +color: #ff; } .menuitem:selected { diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css index 980f24c..9b40227 100644 --- a/themes/dawn/gtk-3.0/gtk.css +++ b/themes/dawn/gtk-3.0/gtk.css @@ -36,7 +36,6 @@ -GtkCheckButton-indicator-size : 12; -GtkMenuBar-internal-padding : 4; -GtkMenuBar-shadow-type : out; --GtkMenuItem-selected-shadow-type: etched-in; -GtkPaned-handle-size : 7; -GtkRange-slider
[Xfce4-commits] gtk-xfce-engine:master Use size for the radio and check boxes (bug #8456)
Updating branch refs/heads/master to ad461c453a0415d8781280a857397639a8190271 (commit) from 3765a80cf3acd1e63f3207bc0b873ffcab6ef78c (commit) commit ad461c453a0415d8781280a857397639a8190271 Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 25 14:12:51 2012 +0200 Use size for the radio and check boxes (bug #8456) gtk-2.0/xfce_theme_draw.c | 290 +++- gtk-3.0/xfce_engine.c | 241 ++--- 2 files changed, 294 insertions(+), 237 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 8ffc61b..bef4648 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -59,83 +59,8 @@ static GtkStyleClass *parent_class = NULL; extern GtkStyleClass xfce_default_class; -/* Taken from raleigh theme engine */ -typedef enum -{ -CHECK_LIGHT, -CHECK_DARK, -CHECK_BASE, -CHECK_TEXT, -CHECK_CROSS, -CHECK_DASH, -RADIO_LIGHT, -RADIO_DARK, -RADIO_BASE, -RADIO_TEXT -} -Part; - -#define PART_SIZE 13 - -static const guint32 check_light_bits[] = { -0x, 0x, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, -0x0800, 0x0800, 0x0ffc, 0x, -}; -static const guint32 check_dark_bits[] = { -0x, 0x0ffe, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, -0x0002, 0x0002, 0x0002, 0x, -}; -static const guint32 check_base_bits[] = { -0x, 0x, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, -0x07fc, 0x07fc, 0x, 0x, -}; -static const guint32 check_text_bits[] = { -0x, 0x, 0x1c00, 0x0f00, 0x0380, 0x01c0, 0x00e0, 0x0073, 0x003f, -0x003e, 0x001c, 0x0018, 0x0008 -}; -static const guint32 check_cross_bits[] = { -0x, 0x, 0x, 0x0300, 0x0380, 0x01d8, 0x00f8, 0x0078, 0x0038, -0x0018, 0x, 0x, 0x, -}; -static const guint32 check_dash_bits[] = { -0x, 0x, 0x, 0x, 0x, 0x03f8, 0x03f8, 0x03f8, 0x, -0x, 0x, 0x, 0x, -}; -static const guint32 radio_light_bits[] = { -0x, 0x, 0x, 0x0400, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, -0x0400, 0x0208, 0x01f0, 0x, -}; -static const guint32 radio_dark_bits[] = { -0x, 0x01f0, 0x0208, 0x0004, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, -0x0004, 0x, 0x, 0x, -}; -static const guint32 radio_base_bits[] = { -0x, 0x, 0x01f0, 0x03f8, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, -0x03f8, 0x01f0, 0x, 0x, -}; -static const guint32 radio_text_bits[] = { -0x, 0x, 0x, 0x, 0x00e0, 0x01f0, 0x01f0, 0x01f0, 0x00e0, -0x, 0x, 0x, 0x, -}; - -static struct -{ -const guint32 *bits; -cairo_surface_t *bmap; -} -parts[] = -{ -{ check_light_bits, NULL }, -{ check_dark_bits, NULL }, -{ check_base_bits, NULL }, -{ check_text_bits, NULL }, -{ check_cross_bits, NULL }, -{ check_dash_bits, NULL }, -{ radio_light_bits, NULL }, -{ radio_dark_bits, NULL }, -{ radio_base_bits, NULL }, -{ radio_text_bits, NULL } -}; +#define CHECK_MIN_SIZE 15 +#define CHECK_DRAW_SIZE 11 /* internal functions */ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint x, gint y, gint width, gint height); @@ -1034,102 +959,191 @@ static void draw_box(GtkStyle * style, GdkWindow * window, GtkStateType state_ty draw_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); } -static cairo_surface_t *get_part_bmap (Part part) +static void draw_dash(cairo_t * cr, const GdkColor * c, gdouble x, gdouble y, guint size) { -if (!parts[part].bmap) -{ -parts[part].bmap = cairo_image_surface_create_for_data((guchar*)parts[part].bits, CAIRO_FORMAT_A1, PART_SIZE, PART_SIZE, sizeof(guint32)); -} -return parts[part].bmap; -} +guint w, b; -static void draw_part(GdkDrawable * drawable, GdkColor * c, GdkRectangle * area, gint x, gint y, Part part) -{ -cairo_t *cr; +b = (size + 7) / 10; -cr = ge_gdk_drawable_to_cairo(drawable, area); +w = size / 4; +if ((w % 2) != (size % 2)) +{ +w += 1; +} gdk_cairo_set_source_color(cr, c); -cairo_mask_surface(cr, get_part_bmap (part), x, y); +cairo_set_line_width (cr, w); +cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT); -cairo_destroy(cr); +cairo_move_to (cr, x + b, y + size / 2.0); +cairo_line_to (cr, x + size - b, y + size / 2.0); + +cairo_stroke(cr); } static void draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state, GtkShadowType shadow, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint x, gint y, gint width, gint height) { +cairo_t *cr; +guint size; +guint w, b; + CHECK_ARGS; SANITIZE_SIZE; -x -= (1 + PART_SIZE - width
[Xfce4-commits] gtk-xfce-engine:master Draw inset border around default button (bug #8454)
Updating branch refs/heads/master to 8e0ab26b57e5d87b7434ac3045946c07a37dff03 (commit) from ad461c453a0415d8781280a857397639a8190271 (commit) commit 8e0ab26b57e5d87b7434ac3045946c07a37dff03 Author: Peter de Ridder pe...@xfce.org Date: Mon Mar 26 23:39:27 2012 +0200 Draw inset border around default button (bug #8454) Gtk 3 doesn't draw a inset border around the default button when -GtkButton-default-border is set. With -xfce-button-default-border this border will be drawn. gtk-3.0/xfce_engine.c | 70 +--- 1 files changed, 59 insertions(+), 11 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index c2231e4..e04b146 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -15,7 +15,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Copyright (C) 1999-2004 Olivier Fourdan (four...@xfce.org) - * Copyright (C) 2011 Peter de Ridder (pe...@xfce.org) + * Copyright (C) 2011-2012 Peter de Ridder (pe...@xfce.org) * * Portions based Thinice port by * Tim Gerla t...@rrv.net, @@ -57,6 +57,9 @@ #define GRIP_STYLE grip-style #define XFCE_GRIP_STYLE -XFCE_NAMESPACE-GRIP_STYLE +#define BUTTON_DEFAULT_BORDER button-default-border +#define XFCE_BUTTON_DEFAULT_BORDER -XFCE_NAMESPACE-BUTTON_DEFAULT_BORDER + /* macros to make sure that things are sane ... */ #define GE_CAIRO_INIT \ cairo_set_line_width (cr, 1.0); \ @@ -70,6 +73,7 @@ G_DEFINE_DYNAMIC_TYPE(XfceEngine, xfce_engine, GTK_TYPE_THEMING_ENGINE) /* internal functions */ static void xfce_draw_grips(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height, GtkOrientation orientation); +static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height, GtkBorderStyle border_style); static void render_line(GtkThemingEngine * engine, cairo_t * cr, gdouble x1, gdouble y1, gdouble x2, gdouble y2); static void render_background(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height); @@ -409,13 +413,58 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo gint xthick, ythick; GtkStateFlags state; GtkBorderStyle border_style; +GtkBorder border; +GtkBorder *default_border; + +state = gtk_theming_engine_get_state(engine); +gtk_theming_engine_get(engine, state, GTK_STYLE_PROPERTY_BORDER_STYLE, border_style, NULL); + +xthick = border.left; +ythick = border.top; + +xt = MIN(xthick, width - 1); +yt = MIN(ythick, height - 1); + +/* Spin buttons are a special case */ +if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SPINBUTTON) gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_BUTTON)) +{ +/* Draw an outset border when hovering a spinner button */ +if (!(state GTK_STATE_FLAG_ACTIVE)) +border_style = GTK_BORDER_STYLE_OUTSET; +} + +/* Default buttons are a special case */ +if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_BUTTON) gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_DEFAULT)) +{ +/* Draw an inset border around the default border */ +gtk_theming_engine_get(engine, state, XFCE_BUTTON_DEFAULT_BORDER, default_border, NULL); + + if (default_border +(default_border-left xt) (default_border-right xt) + (default_border-top yt) (default_border-bottom yt)) + { +xfce_draw_frame(engine, cr, x - default_border-left, y - default_border-top, +width + default_border-left + default_border-right, height + default_border-top + default_border-bottom, +GTK_BORDER_STYLE_INSET); + } + +gtk_border_free(default_border); +} + +xfce_draw_frame(engine, cr, x, y, width, height, border_style); +} + +static void xfce_draw_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height, GtkBorderStyle border_style) +{ +gint xt, yt; +gint xthick, ythick; +GtkStateFlags state; GdkRGBA dark, light, mid, bg; GdkRGBA black = {0.0, 0.0, 0.0, 1.0}; /* black */ gboolean smooth_edge; GtkBorder border; state = gtk_theming_engine_get_state(engine); -gtk_theming_engine_get(engine, state, GTK_STYLE_PROPERTY_BORDER_STYLE, border_style, NULL); if (border_style == GTK_BORDER_STYLE_NONE) return; @@ -428,14 +477,6 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo xthick = border.left; ythick = border.top; -/* Spin buttons are a special case */ -if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SPINBUTTON) gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_BUTTON)) -{ -/* Draw
[Xfce4-commits] gtk-xfce-engine:master Set -xfce-button-default-border (bug #8454)
Updating branch refs/heads/master to 955dd154a2a28d209f1cb35bd6c1c7e556c6afc0 (commit) from 8e0ab26b57e5d87b7434ac3045946c07a37dff03 (commit) commit 955dd154a2a28d209f1cb35bd6c1c7e556c6afc0 Author: Peter de Ridder pe...@xfce.org Date: Thu Mar 29 21:37:37 2012 +0200 Set -xfce-button-default-border (bug #8454) Xfce-stellar themes/stellar/gtk-3.0/gtk.css |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/themes/stellar/gtk-3.0/gtk.css b/themes/stellar/gtk-3.0/gtk.css index d9fdea2..04e48b3 100644 --- a/themes/stellar/gtk-3.0/gtk.css +++ b/themes/stellar/gtk-3.0/gtk.css @@ -31,6 +31,7 @@ -GtkButton-default-border: 5; -GtkButton-default-outside-border: 6; +-xfce-button-default-border : 5; -GtkWidget-focus-padding : 0; -GtkCheckButton-indicator-size : 15; -GtkRange-slider-width : 12; @@ -75,6 +76,10 @@ border-color: darker(@bg_selected); } +*:focus { +-xfce-button-default-border: 7; +} + .view, .entry { color: @text_normal; background-color: @base_normal; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Release 2.99.2!
Updating branch refs/heads/master to ce59bdc13ecfb547f9cb3211fd42acc91b321cf1 (commit) from aa2f6b7e241e5a8e7ec32d91f8f2e785ac71819c (commit) commit ce59bdc13ecfb547f9cb3211fd42acc91b321cf1 Author: Peter de Ridder pe...@xfce.org Date: Thu Mar 29 21:50:38 2012 +0200 Release 2.99.2! NEWS|7 +++ configure.in.in |4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ae30134..6a2559d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +2.99.2 +== +- Improved menu theming +- Theme gtk-tooltip (bug #8494). +- Scale radio and check boxes (bug #8456). +- Draw inset border around default button (bug #8454). + 2.99.1 == - Changed rendering of GtkSpinButton. diff --git a/configure.in.in b/configure.in.in index 7e87fef..ce1ce38 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,10 +7,10 @@ dnl *** Version information *** dnl *** m4_define([gtk_xfce_engine_version_major], [2]) m4_define([gtk_xfce_engine_version_minor], [99]) -m4_define([gtk_xfce_engine_version_micro], [1]) +m4_define([gtk_xfce_engine_version_micro], [2]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], [git]) +m4_define([gtk_xfce_engine_version_tag], []) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Post release tag bump.
Updating branch refs/heads/master to f624005960e8cfe24cbddd2c717a84e22f657227 (commit) from ce59bdc13ecfb547f9cb3211fd42acc91b321cf1 (commit) commit f624005960e8cfe24cbddd2c717a84e22f657227 Author: Peter de Ridder pe...@xfce.org Date: Thu Mar 29 21:54:47 2012 +0200 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index ce1ce38..4aaa4f2 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [99]) m4_define([gtk_xfce_engine_version_micro], [2]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], []) +m4_define([gtk_xfce_engine_version_tag], [git]) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Merge branch 'peter/gtk3'
Updating branch refs/heads/master to aa2f6b7e241e5a8e7ec32d91f8f2e785ac71819c (commit) from e9d9e7b48b69277a064c7eb30a17b1ef16662a7d (commit) commit aa2f6b7e241e5a8e7ec32d91f8f2e785ac71819c Merge: e9d9e7b 955dd15 Author: Peter de Ridder pe...@xfce.org Date: Thu Mar 29 21:40:31 2012 +0200 Merge branch 'peter/gtk3' commit 955dd154a2a28d209f1cb35bd6c1c7e556c6afc0 Author: Peter de Ridder pe...@xfce.org Date: Thu Mar 29 21:37:37 2012 +0200 Set -xfce-button-default-border (bug #8454) Xfce-stellar commit 8e0ab26b57e5d87b7434ac3045946c07a37dff03 Author: Peter de Ridder pe...@xfce.org Date: Mon Mar 26 23:39:27 2012 +0200 Draw inset border around default button (bug #8454) Gtk 3 doesn't draw a inset border around the default button when -GtkButton-default-border is set. With -xfce-button-default-border this border will be drawn. commit ad461c453a0415d8781280a857397639a8190271 Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 25 14:12:51 2012 +0200 Use size for the radio and check boxes (bug #8456) commit 3765a80cf3acd1e63f3207bc0b873ffcab6ef78c Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 25 10:43:58 2012 +0200 Correctly match gtk-tooltip widgets (bug #8494) commit 3986032f9ebdde4d6c8d4df65bc1446495da0ce2 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 19 15:26:41 2012 +0100 Improved menu theming gtk-2.0/xfce_theme_draw.c| 290 +++- gtk-3.0/xfce_engine.c| 311 -- themes/b5/gtk-3.0/gtk.css|9 +- themes/basic/gtk-3.0/gtk.css |4 + themes/cadmium/gtk-3.0/gtk.css |9 +- themes/curve/gtk-3.0/gtk.css | 10 +- themes/dawn/gtk-3.0/gtk.css |7 +- themes/dusk/gtk-3.0/gtk.css |7 +- themes/kde2/gtk-3.0/gtk.css |5 +- themes/kolors/gtk-3.0/gtk.css|9 +- themes/light/gtk-3.0/gtk.css |8 +- themes/orange/gtk-3.0/gtk.css| 14 ++- themes/redmondxp/gtk-3.0/gtk.css | 34 ++--- themes/saltlake/gtk-3.0/gtk.css |3 + themes/smooth/gtk-3.0/gtk.css|8 +- themes/stellar/gtk-3.0/gtk.css | 10 +- themes/winter/gtk-3.0/gtk.css| 12 +- themes/xfce-4.0/gtk-3.0/gtk.css |8 +- themes/xfce-4.2/gtk-3.0/gtk.css | 12 +- themes/xfce-4.4/gtk-3.0/gtk.css |9 +- themes/xfce-4.6/gtk-3.0/gtk.css | 20 ++-- themes/xfce/gtk-3.0/gtk.css | 20 ++-- 22 files changed, 496 insertions(+), 323 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 8ffc61b..bef4648 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -59,83 +59,8 @@ static GtkStyleClass *parent_class = NULL; extern GtkStyleClass xfce_default_class; -/* Taken from raleigh theme engine */ -typedef enum -{ -CHECK_LIGHT, -CHECK_DARK, -CHECK_BASE, -CHECK_TEXT, -CHECK_CROSS, -CHECK_DASH, -RADIO_LIGHT, -RADIO_DARK, -RADIO_BASE, -RADIO_TEXT -} -Part; - -#define PART_SIZE 13 - -static const guint32 check_light_bits[] = { -0x, 0x, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, -0x0800, 0x0800, 0x0ffc, 0x, -}; -static const guint32 check_dark_bits[] = { -0x, 0x0ffe, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, -0x0002, 0x0002, 0x0002, 0x, -}; -static const guint32 check_base_bits[] = { -0x, 0x, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, -0x07fc, 0x07fc, 0x, 0x, -}; -static const guint32 check_text_bits[] = { -0x, 0x, 0x1c00, 0x0f00, 0x0380, 0x01c0, 0x00e0, 0x0073, 0x003f, -0x003e, 0x001c, 0x0018, 0x0008 -}; -static const guint32 check_cross_bits[] = { -0x, 0x, 0x, 0x0300, 0x0380, 0x01d8, 0x00f8, 0x0078, 0x0038, -0x0018, 0x, 0x, 0x, -}; -static const guint32 check_dash_bits[] = { -0x, 0x, 0x, 0x, 0x, 0x03f8, 0x03f8, 0x03f8, 0x, -0x, 0x, 0x, 0x, -}; -static const guint32 radio_light_bits[] = { -0x, 0x, 0x, 0x0400, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, -0x0400, 0x0208, 0x01f0, 0x, -}; -static const guint32 radio_dark_bits[] = { -0x, 0x01f0, 0x0208, 0x0004, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, -0x0004, 0x, 0x, 0x, -}; -static const guint32 radio_base_bits[] = { -0x, 0x, 0x01f0, 0x03f8, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, -0x03f8, 0x01f0, 0x, 0x, -}; -static const guint32 radio_text_bits[] = { -0x, 0x, 0x, 0x, 0x00e0, 0x01f0, 0x01f0, 0x01f0, 0x00e0, -0x, 0x, 0x, 0x, -}; - -static struct -{ -const guint32 *bits; -cairo_surface_t *bmap; -} -parts[] = -{ -{ check_light_bits, NULL }, -{ check_dark_bits, NULL }, -{ check_base_bits, NULL }, -{ check_text_bits, NULL }, -{ check_cross_bits, NULL }, -{ check_dash_bits, NULL }, -{ radio_light_bits, NULL
[Xfce4-commits] gtk-xfce-engine|gtk-xfce-engine-2.99.2 Creating annotated tag gtk-xfce-engine-2.99.2
Updating annotated tag refs/tags/gtk-xfce-engine-2.99.2 as new annotated tag to cb4c58c2ac8ecf6a553ee7a83d742c6e6b7c6e82 (tag) succeeds gtk-xfce-engine-2.99.1-9-gaa2f6b7 tagged by Peter de Ridder pe...@xfce.org on 2012-03-29 21:53 +0200 Peter de Ridder (1): Release 2.99.2! ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:stephan/dialogs Further implemented script.
Updating branch refs/heads/stephan/dialogs to dbddd013a406bcdd5c0338002a2bbc703e613105 (commit) from e22d28f50106282dd193da95d879cf6012837b39 (commit) commit dbddd013a406bcdd5c0338002a2bbc703e613105 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 26 20:50:09 2012 +0100 Further implemented script. Added support for Gtk-3.0 and Icons themes. Support themes which don't have a theme name directory in there package. Added tar.xz file extension for packages. .../appearance-settings/appearance-install-theme | 80 +--- 1 files changed, 69 insertions(+), 11 deletions(-) diff --git a/dialogs/appearance-settings/appearance-install-theme b/dialogs/appearance-settings/appearance-install-theme index 59e10f4..13f61ae 100755 --- a/dialogs/appearance-settings/appearance-install-theme +++ b/dialogs/appearance-settings/appearance-install-theme @@ -16,6 +16,20 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# appearance-install-theme theme-package +# return value: +# 1: common error, should never happen +# 2: File too big +# 3: Failed to create temp directory +# 4: Failed to extract archive +# 5: Unknown file format +# theme-package can be a tar-file zip-file or a directory +# the following themes types are supported: +# - Gtk-2 +# - Gtk-3 +# - Xfwm +# - Icons + dndfilename=$1 retval=0 @@ -26,9 +40,10 @@ installtheme() basedir=${file#$tmpdir/} themedir=${basedir%/$suffix} -themename=`basename $themedir` +themename=${3:-`basename $themedir`} themetype=`dirname $suffix` -src=$tmpdir/$themedir/$themetype +themesrc=`dirname $basedir` +src=$tmpdir/$themesrc dest=$HOME/.themes/$themename if test ! -d $dest/$themetype; then @@ -37,6 +52,35 @@ installtheme() fi } +installicontheme() +{ +file=$1 +suffix=$2 + +basedir=${file#$tmpdir/} +themedir=${basedir%/$suffix} +themename=${3:-`basename $themedir`} +src=$tmpdir/$themedir + +dest=$HOME/.icons +if test ! -d $dest/$themename; then +# move theme to the users' theme directory +mkdir -p $dest mv $src $dest +fi +} + +detectthemes() +{ +suffix=$1 + +if test -f $tmpdir/$suffix; then +installtheme $tmpdir/$suffix $suffix $pkgname +fi +find $tmpdir -path $tmpdir/*/$suffix -type f | while read file; do +installtheme $file $suffix +done +} + # leave if no file is provided if test -z $dndfilename -o -z $HOME; then # 1: common error, should never happen @@ -56,7 +100,7 @@ fi # we try $XDG_CACHE_HOME because it is more likely this is on the # same partition, so moving the theme after extract is faster if test x`which mktemp 2/dev/null` != x; then -tmpdir=`TMPDIR=$XDG_CACHE_HOME mktemp -d` +tmpdir=`TMPDIR=${XDG_CACHE_HOME:-$TMPDIR} mktemp -d` else tmpdir=/tmp/tmp.$$.$RANDOM mkdir $tmpdir @@ -69,15 +113,18 @@ fi # check if uri is directory or file if test -d $dndfilename; then cp -r $dndfilename $tmpdir || retval=1 +pkgname=`basename $dndfilename` elif test -f $dndfilename; then case $dndfilename in -*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tbz|*.tar) +*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tbz|*.tar|*.tar.xz|*.txz) # extract the archive tar -C $tmpdir -xf $dndfilename || retval=4 +pkgname=`basename ${dndfilename%.*} .tar` ;; *.zip) # extract the archive -unzip -d $tmpdir $dndfilename || retval=4 +unzip -qq -d $tmpdir $dndfilename || retval=4 +pkgname=`basename $dndfilename .zip` ;; *) # 5: unknow file format @@ -90,15 +137,26 @@ fi # extracting or copying succeeded if test $retval -eq 0; then # install gtk-2.0 themes -suffix=gtk-2.0/gtkrc -find $tmpdir -path $tmpdir/*/$suffix -type f | while read file; do -installtheme $file $suffix -done +detectthemes gtk-2.0/gtkrc + +# install gtk-3.0 themes +detectthemes gtk-3.0/gtkrc # install xfwm4 themes -suffix=xfwm4/themerc +detectthemes xfwm4/themerc + +# install icon themes +suffix=index.theme +section=Icon Theme +if test -f $tmpdir/$suffix; then +if grep -q -i ^\\[$section\\] $tmpdir/$suffix; then +installicontheme $tmpdir/$suffix $suffix $pkgname +fi +fi find $tmpdir -path $tmpdir/*/$suffix -type f | while read file; do -installtheme $file $suffix +if grep -q -i ^\\[$section\\] $file; then +installicontheme $file $suffix +fi done fi ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Don't use menubar style border for menubar items
Updating branch refs/heads/master to 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit) from 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d (commit) commit 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 19 13:50:28 2012 +0100 Don't use menubar style border for menubar items gtk-3.0/xfce_engine.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index 123977a..ce25dca 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -681,7 +681,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo cairo_stroke(cr); } } -else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) +else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR) + !gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM)) { if ((xt 1) (yt 1)) { @@ -884,7 +885,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo { /* Do nothing */ } -else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) +else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR) + !gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM)) { if ((xt 1) (yt 1)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Correctly match gtk-tooltip widgets (bug #8494)
Updating branch refs/heads/master to e9d9e7b48b69277a064c7eb30a17b1ef16662a7d (commit) from 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit) commit e9d9e7b48b69277a064c7eb30a17b1ef16662a7d Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 25 10:43:58 2012 +0200 Correctly match gtk-tooltip widgets (bug #8494) themes/orange/gtk-2.0/gtkrc |2 +- themes/xfce-4.4/gtk-2.0/gtkrc |2 +- themes/xfce-4.6/gtk-2.0/gtkrc |2 +- themes/xfce/gtk-2.0/gtkrc |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/orange/gtk-2.0/gtkrc b/themes/orange/gtk-2.0/gtkrc index eba6a42..713906f 100644 --- a/themes/orange/gtk-2.0/gtkrc +++ b/themes/orange/gtk-2.0/gtkrc @@ -293,7 +293,7 @@ class *GtkVScale*style scale widget_class *.GtkProgress* style progress class *.GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox diff --git a/themes/xfce-4.4/gtk-2.0/gtkrc b/themes/xfce-4.4/gtk-2.0/gtkrc index dc676a0..879c95d 100644 --- a/themes/xfce-4.4/gtk-2.0/gtkrc +++ b/themes/xfce-4.4/gtk-2.0/gtkrc @@ -339,7 +339,7 @@ class *GtkVScale*style scale widget_class *GtkProgress* style progress class *GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox diff --git a/themes/xfce-4.6/gtk-2.0/gtkrc b/themes/xfce-4.6/gtk-2.0/gtkrc index fe39654..9f7d131 100644 --- a/themes/xfce-4.6/gtk-2.0/gtkrc +++ b/themes/xfce-4.6/gtk-2.0/gtkrc @@ -388,7 +388,7 @@ class *GtkVScale*style scale widget_class *GtkProgress* style progress class *GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox diff --git a/themes/xfce/gtk-2.0/gtkrc b/themes/xfce/gtk-2.0/gtkrc index e533aab..b2a33e0 100644 --- a/themes/xfce/gtk-2.0/gtkrc +++ b/themes/xfce/gtk-2.0/gtkrc @@ -388,7 +388,7 @@ class *GtkVScale*style scale widget_class *GtkProgress* style progress class *GtkProgress* style progress -widget gtk-tooltips* style tooltips +widget gtk-tooltip* style tooltips widget_class *.Collectionstyle rox ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Use size for the radio and check boxes (bug #8456)
Updating branch refs/heads/peter/gtk3 to ad461c453a0415d8781280a857397639a8190271 (commit) from 3765a80cf3acd1e63f3207bc0b873ffcab6ef78c (commit) commit ad461c453a0415d8781280a857397639a8190271 Author: Peter de Ridder pe...@xfce.org Date: Sun Mar 25 14:12:51 2012 +0200 Use size for the radio and check boxes (bug #8456) gtk-2.0/xfce_theme_draw.c | 290 +++- gtk-3.0/xfce_engine.c | 241 ++--- 2 files changed, 294 insertions(+), 237 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 8ffc61b..bef4648 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -59,83 +59,8 @@ static GtkStyleClass *parent_class = NULL; extern GtkStyleClass xfce_default_class; -/* Taken from raleigh theme engine */ -typedef enum -{ -CHECK_LIGHT, -CHECK_DARK, -CHECK_BASE, -CHECK_TEXT, -CHECK_CROSS, -CHECK_DASH, -RADIO_LIGHT, -RADIO_DARK, -RADIO_BASE, -RADIO_TEXT -} -Part; - -#define PART_SIZE 13 - -static const guint32 check_light_bits[] = { -0x, 0x, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, -0x0800, 0x0800, 0x0ffc, 0x, -}; -static const guint32 check_dark_bits[] = { -0x, 0x0ffe, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, -0x0002, 0x0002, 0x0002, 0x, -}; -static const guint32 check_base_bits[] = { -0x, 0x, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, -0x07fc, 0x07fc, 0x, 0x, -}; -static const guint32 check_text_bits[] = { -0x, 0x, 0x1c00, 0x0f00, 0x0380, 0x01c0, 0x00e0, 0x0073, 0x003f, -0x003e, 0x001c, 0x0018, 0x0008 -}; -static const guint32 check_cross_bits[] = { -0x, 0x, 0x, 0x0300, 0x0380, 0x01d8, 0x00f8, 0x0078, 0x0038, -0x0018, 0x, 0x, 0x, -}; -static const guint32 check_dash_bits[] = { -0x, 0x, 0x, 0x, 0x, 0x03f8, 0x03f8, 0x03f8, 0x, -0x, 0x, 0x, 0x, -}; -static const guint32 radio_light_bits[] = { -0x, 0x, 0x, 0x0400, 0x0800, 0x0800, 0x0800, 0x0800, 0x0800, -0x0400, 0x0208, 0x01f0, 0x, -}; -static const guint32 radio_dark_bits[] = { -0x, 0x01f0, 0x0208, 0x0004, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, -0x0004, 0x, 0x, 0x, -}; -static const guint32 radio_base_bits[] = { -0x, 0x, 0x01f0, 0x03f8, 0x07fc, 0x07fc, 0x07fc, 0x07fc, 0x07fc, -0x03f8, 0x01f0, 0x, 0x, -}; -static const guint32 radio_text_bits[] = { -0x, 0x, 0x, 0x, 0x00e0, 0x01f0, 0x01f0, 0x01f0, 0x00e0, -0x, 0x, 0x, 0x, -}; - -static struct -{ -const guint32 *bits; -cairo_surface_t *bmap; -} -parts[] = -{ -{ check_light_bits, NULL }, -{ check_dark_bits, NULL }, -{ check_base_bits, NULL }, -{ check_text_bits, NULL }, -{ check_cross_bits, NULL }, -{ check_dash_bits, NULL }, -{ radio_light_bits, NULL }, -{ radio_dark_bits, NULL }, -{ radio_base_bits, NULL }, -{ radio_text_bits, NULL } -}; +#define CHECK_MIN_SIZE 15 +#define CHECK_DRAW_SIZE 11 /* internal functions */ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint x, gint y, gint width, gint height); @@ -1034,102 +959,191 @@ static void draw_box(GtkStyle * style, GdkWindow * window, GtkStateType state_ty draw_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); } -static cairo_surface_t *get_part_bmap (Part part) +static void draw_dash(cairo_t * cr, const GdkColor * c, gdouble x, gdouble y, guint size) { -if (!parts[part].bmap) -{ -parts[part].bmap = cairo_image_surface_create_for_data((guchar*)parts[part].bits, CAIRO_FORMAT_A1, PART_SIZE, PART_SIZE, sizeof(guint32)); -} -return parts[part].bmap; -} +guint w, b; -static void draw_part(GdkDrawable * drawable, GdkColor * c, GdkRectangle * area, gint x, gint y, Part part) -{ -cairo_t *cr; +b = (size + 7) / 10; -cr = ge_gdk_drawable_to_cairo(drawable, area); +w = size / 4; +if ((w % 2) != (size % 2)) +{ +w += 1; +} gdk_cairo_set_source_color(cr, c); -cairo_mask_surface(cr, get_part_bmap (part), x, y); +cairo_set_line_width (cr, w); +cairo_set_line_cap(cr, CAIRO_LINE_CAP_BUTT); -cairo_destroy(cr); +cairo_move_to (cr, x + b, y + size / 2.0); +cairo_line_to (cr, x + size - b, y + size / 2.0); + +cairo_stroke(cr); } static void draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state, GtkShadowType shadow, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint x, gint y, gint width, gint height) { +cairo_t *cr; +guint size; +guint w, b; + CHECK_ARGS; SANITIZE_SIZE; -x -= (1 + PART_SIZE - width
[Xfce4-commits] xfce4-settings:master Further implemented script.
Updating branch refs/heads/master to dbddd013a406bcdd5c0338002a2bbc703e613105 (commit) from e22d28f50106282dd193da95d879cf6012837b39 (commit) commit dbddd013a406bcdd5c0338002a2bbc703e613105 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 26 20:50:09 2012 +0100 Further implemented script. Added support for Gtk-3.0 and Icons themes. Support themes which don't have a theme name directory in there package. Added tar.xz file extension for packages. .../appearance-settings/appearance-install-theme | 80 +--- 1 files changed, 69 insertions(+), 11 deletions(-) diff --git a/dialogs/appearance-settings/appearance-install-theme b/dialogs/appearance-settings/appearance-install-theme index 59e10f4..13f61ae 100755 --- a/dialogs/appearance-settings/appearance-install-theme +++ b/dialogs/appearance-settings/appearance-install-theme @@ -16,6 +16,20 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# appearance-install-theme theme-package +# return value: +# 1: common error, should never happen +# 2: File too big +# 3: Failed to create temp directory +# 4: Failed to extract archive +# 5: Unknown file format +# theme-package can be a tar-file zip-file or a directory +# the following themes types are supported: +# - Gtk-2 +# - Gtk-3 +# - Xfwm +# - Icons + dndfilename=$1 retval=0 @@ -26,9 +40,10 @@ installtheme() basedir=${file#$tmpdir/} themedir=${basedir%/$suffix} -themename=`basename $themedir` +themename=${3:-`basename $themedir`} themetype=`dirname $suffix` -src=$tmpdir/$themedir/$themetype +themesrc=`dirname $basedir` +src=$tmpdir/$themesrc dest=$HOME/.themes/$themename if test ! -d $dest/$themetype; then @@ -37,6 +52,35 @@ installtheme() fi } +installicontheme() +{ +file=$1 +suffix=$2 + +basedir=${file#$tmpdir/} +themedir=${basedir%/$suffix} +themename=${3:-`basename $themedir`} +src=$tmpdir/$themedir + +dest=$HOME/.icons +if test ! -d $dest/$themename; then +# move theme to the users' theme directory +mkdir -p $dest mv $src $dest +fi +} + +detectthemes() +{ +suffix=$1 + +if test -f $tmpdir/$suffix; then +installtheme $tmpdir/$suffix $suffix $pkgname +fi +find $tmpdir -path $tmpdir/*/$suffix -type f | while read file; do +installtheme $file $suffix +done +} + # leave if no file is provided if test -z $dndfilename -o -z $HOME; then # 1: common error, should never happen @@ -56,7 +100,7 @@ fi # we try $XDG_CACHE_HOME because it is more likely this is on the # same partition, so moving the theme after extract is faster if test x`which mktemp 2/dev/null` != x; then -tmpdir=`TMPDIR=$XDG_CACHE_HOME mktemp -d` +tmpdir=`TMPDIR=${XDG_CACHE_HOME:-$TMPDIR} mktemp -d` else tmpdir=/tmp/tmp.$$.$RANDOM mkdir $tmpdir @@ -69,15 +113,18 @@ fi # check if uri is directory or file if test -d $dndfilename; then cp -r $dndfilename $tmpdir || retval=1 +pkgname=`basename $dndfilename` elif test -f $dndfilename; then case $dndfilename in -*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tbz|*.tar) +*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tbz|*.tar|*.tar.xz|*.txz) # extract the archive tar -C $tmpdir -xf $dndfilename || retval=4 +pkgname=`basename ${dndfilename%.*} .tar` ;; *.zip) # extract the archive -unzip -d $tmpdir $dndfilename || retval=4 +unzip -qq -d $tmpdir $dndfilename || retval=4 +pkgname=`basename $dndfilename .zip` ;; *) # 5: unknow file format @@ -90,15 +137,26 @@ fi # extracting or copying succeeded if test $retval -eq 0; then # install gtk-2.0 themes -suffix=gtk-2.0/gtkrc -find $tmpdir -path $tmpdir/*/$suffix -type f | while read file; do -installtheme $file $suffix -done +detectthemes gtk-2.0/gtkrc + +# install gtk-3.0 themes +detectthemes gtk-3.0/gtkrc # install xfwm4 themes -suffix=xfwm4/themerc +detectthemes xfwm4/themerc + +# install icon themes +suffix=index.theme +section=Icon Theme +if test -f $tmpdir/$suffix; then +if grep -q -i ^\\[$section\\] $tmpdir/$suffix; then +installicontheme $tmpdir/$suffix $suffix $pkgname +fi +fi find $tmpdir -path $tmpdir/*/$suffix -type f | while read file; do -installtheme $file $suffix +if grep -q -i ^\\[$section\\] $file; then +installicontheme $file $suffix +fi done fi ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Release 2.99.1!
Updating branch refs/heads/peter/gtk3 to 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 (commit) from c51477618af859df685ff356aaa7cea858a00308 (commit) commit 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 Author: Peter de Ridder pe...@xfce.org Date: Fri Feb 10 22:49:37 2012 +0100 Release 2.99.1! NEWS|6 ++ configure.in.in |4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d09486d..ae30134 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +2.99.1 +== +- Changed rendering of GtkSpinButton. +- Pixel align checkboxes in the Gtk+-3.0 engine. +- Link against libm (bug #6253). + 2.99.0 == - Added Gtk+-3.0 theming engine. diff --git a/configure.in.in b/configure.in.in index b6d2125..1041601 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,10 +7,10 @@ dnl *** Version information *** dnl *** m4_define([gtk_xfce_engine_version_major], [2]) m4_define([gtk_xfce_engine_version_minor], [99]) -m4_define([gtk_xfce_engine_version_micro], [0]) +m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], [git]) +m4_define([gtk_xfce_engine_version_tag], []) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Post release tag bump.
Updating branch refs/heads/peter/gtk3 to 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d (commit) from 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 (commit) commit 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d Author: Peter de Ridder pe...@xfce.org Date: Fri Feb 10 23:04:49 2012 +0100 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 1041601..7e87fef 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [99]) m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], []) +m4_define([gtk_xfce_engine_version_tag], [git]) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Don't use menubar style border for menubar items
Updating branch refs/heads/peter/gtk3 to 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit) from 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d (commit) commit 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 19 13:50:28 2012 +0100 Don't use menubar style border for menubar items gtk-3.0/xfce_engine.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index 123977a..ce25dca 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -681,7 +681,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo cairo_stroke(cr); } } -else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) +else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR) + !gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM)) { if ((xt 1) (yt 1)) { @@ -884,7 +885,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo { /* Do nothing */ } -else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) +else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR) + !gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM)) { if ((xt 1) (yt 1)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Improved menu theming
Updating branch refs/heads/peter/gtk3 to 3986032f9ebdde4d6c8d4df65bc1446495da0ce2 (commit) from 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit) commit 3986032f9ebdde4d6c8d4df65bc1446495da0ce2 Author: Peter de Ridder pe...@xfce.org Date: Sun Feb 19 15:26:41 2012 +0100 Improved menu theming themes/b5/gtk-3.0/gtk.css|9 - themes/basic/gtk-3.0/gtk.css |4 themes/cadmium/gtk-3.0/gtk.css |9 +++-- themes/curve/gtk-3.0/gtk.css | 10 +++--- themes/dawn/gtk-3.0/gtk.css |7 +-- themes/dusk/gtk-3.0/gtk.css |7 +-- themes/kde2/gtk-3.0/gtk.css |5 - themes/kolors/gtk-3.0/gtk.css|9 - themes/light/gtk-3.0/gtk.css |8 +++- themes/orange/gtk-3.0/gtk.css| 14 ++ themes/redmondxp/gtk-3.0/gtk.css | 34 -- themes/saltlake/gtk-3.0/gtk.css |3 +++ themes/smooth/gtk-3.0/gtk.css|8 +++- themes/stellar/gtk-3.0/gtk.css |5 ++--- themes/winter/gtk-3.0/gtk.css| 12 +--- themes/xfce-4.0/gtk-3.0/gtk.css |8 ++-- themes/xfce-4.2/gtk-3.0/gtk.css | 12 themes/xfce-4.4/gtk-3.0/gtk.css |9 ++--- themes/xfce-4.6/gtk-3.0/gtk.css | 20 ++-- themes/xfce/gtk-3.0/gtk.css | 20 ++-- 20 files changed, 138 insertions(+), 75 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index 6b386e7..e3984ac 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -34,7 +34,6 @@ -GtkWidget-focus-padding : 0; -GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; --GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 11; -GtkRange-stepper-size : 11; -GtkRange-stepper-spacing: 0; @@ -295,6 +294,14 @@ GtkCalendar:selected { border-color: @fg_selected; } +.menuitem { +border-width: 2 2; +} + +.menuitem:hover { +border-style: outset; +} + .slider { color: #525051; diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css index a9850ae..9c8ed0d 100644 --- a/themes/basic/gtk-3.0/gtk.css +++ b/themes/basic/gtk-3.0/gtk.css @@ -43,6 +43,10 @@ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4B6983, 1.0)), to(shade(#4B6983, 1.1))); } +.menuitem { +border-width: 0 0; +} + .scrollbar, .scale { border-width: 2 2; } diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css index eed815c..e1aa2d3 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -318,7 +318,7 @@ GtkCalendar:selected { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95))); } -.dock:hover, .menubar:hover, .toolbar:hover { +.dock:hover, .toolbar:hover { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.05)), to(shade(@bg_prelight, 0.95))); } @@ -348,7 +348,12 @@ GtkCalendar:selected { } .menuitem { -border-width: 1 2; +border-width: 1 1; +background-image: none; +} + +.menuitem:hover { +border-style: solid; } .slider.vertical, .progressbar.vertical { diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css index c80e03e..26b1679 100644 --- a/themes/curve/gtk-3.0/gtk.css +++ b/themes/curve/gtk-3.0/gtk.css @@ -33,7 +33,6 @@ -GtkWidget-focus-padding : 0; -GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; --GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 15; -GtkRange-stepper-size : 15; -GtkRange-stepper-spacing: 0; @@ -319,7 +318,7 @@ GtkCalendar:selected { border-color: @fg_selected; } -.dock:hover, .menubar:hover, .toolbar:hover { +.dock:hover .toolbar:hover { color: #ff; background-color: #4464ac; border-color: darker(#4464ac); @@ -341,8 +340,13 @@ GtkCalendar:selected { .menuitem:hover { color: #ff; -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.0))); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.8))); border-color: darker(#4464ac); +border-style: outset; +} + +.menuitem *:hover { +color: #ff; } .menuitem:selected { diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css index 980f24c..9b40227 100644 --- a/themes/dawn/gtk-3.0/gtk.css +++ b/themes/dawn/gtk-3.0/gtk.css @@ -36,7 +36,6 @@ -GtkCheckButton-indicator-size : 12; -GtkMenuBar-internal-padding : 4; -GtkMenuBar-shadow-type : out; --GtkMenuItem-selected-shadow-type: etched-in; -GtkPaned-handle-size : 7; -GtkRange
[Xfce4-commits] gtk-xfce-engine:master Added Gtk 3 background render function
Updating branch refs/heads/master to 63da31624c2def06cc051f91e55a4c58e46625c6 (commit) from 3c38beab1fefbfd072201241a5ebdb7e31b712fe (commit) commit 63da31624c2def06cc051f91e55a4c58e46625c6 Author: Peter de Ridder pe...@xfce.org Date: Fri Dec 30 16:26:04 2011 +0100 Added Gtk 3 background render function gtk-3.0/xfce_engine.c | 62 + 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index 1c2640e..c8ce045 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -147,6 +147,7 @@ parts[] = static void xfce_draw_grips(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height, GtkOrientation orientation); static void render_line(GtkThemingEngine * engine, cairo_t * cr, gdouble x1, gdouble y1, gdouble x2, gdouble y2); +static void render_background(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height); static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height); static void render_check(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height); @@ -411,6 +412,66 @@ static void render_line(GtkThemingEngine * engine, cairo_t * cr, gdouble x1, gdo } } +static void render_background(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height) +{ +GdkRGBA bg_color; +cairo_pattern_t *pattern; +gint xthick, ythick; +gint xt, yt; +GtkStateFlags state; +GtkBorder border; +gboolean smooth_edge; + +state = gtk_theming_engine_get_state(engine); + +gtk_theming_engine_get_background_color(engine, state, bg_color); +gtk_theming_engine_get(engine, state, GTK_STYLE_PROPERTY_BACKGROUND_IMAGE, pattern, NULL); + +gtk_theming_engine_get(engine, state, XFCE_SMOOTH_EDGE, smooth_edge, NULL); +gtk_theming_engine_get_border (engine, state, border); + +xthick = border.left; +ythick = border.top; + +cairo_save(cr); +cairo_translate(cr, x, y); + +xt = MIN(xthick, width - 1); +yt = MIN(ythick, height - 1); +if(smooth_edge gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_PROGRESSBAR)) +{ +xt = 1; +yt = 1; +} +else +{ +xt = MIN(xt, 2); +yt = MIN(yt, 2); +} + +cairo_rectangle(cr, xt, yt, width - xt * 2, height - yt * 2); + +if(pattern) +{ +cairo_scale(cr, width, height); +cairo_set_source(cr, pattern); +cairo_scale(cr, 1.0 / width, 1.0 / height); +} +else +{ +gdk_cairo_set_source_rgba(cr, bg_color); +} + +cairo_fill(cr); + +if(pattern) +{ +cairo_pattern_destroy (pattern); +} + +cairo_restore(cr); +} + static void render_frame(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdouble y, gdouble width, gdouble height) { gint xt, yt; @@ -1685,6 +1746,7 @@ static void xfce_engine_class_init(XfceEngineClass * klass) GtkThemingEngineClass *engine_class = GTK_THEMING_ENGINE_CLASS(klass); engine_class-render_line = render_line; +engine_class-render_background = render_background; engine_class-render_frame = render_frame; engine_class-render_check = render_check; engine_class-render_option = render_option; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Corrected button prelight color
Updating branch refs/heads/master to 0999214e137164d6f5d1e19f8bf9c0c0d24d1b19 (commit) from 63da31624c2def06cc051f91e55a4c58e46625c6 (commit) commit 0999214e137164d6f5d1e19f8bf9c0c0d24d1b19 Author: Peter de Ridder pe...@xfce.org Date: Sun Jan 8 16:19:39 2012 +0100 Corrected button prelight color Xfce-4.6, Xfce themes/xfce-4.6/gtk-3.0/gtk.css |4 ++-- themes/xfce/gtk-3.0/gtk.css |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/xfce-4.6/gtk-3.0/gtk.css b/themes/xfce-4.6/gtk-3.0/gtk.css index 6e0f287..59b259a 100644 --- a/themes/xfce-4.6/gtk-3.0/gtk.css +++ b/themes/xfce-4.6/gtk-3.0/gtk.css @@ -419,8 +419,8 @@ GtkCalendar:selected { } .button:hover { -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95))); -border-color: darker(#d3d7cf); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.95))); +border-color: darker(#cce2ff); } .button:selected { diff --git a/themes/xfce/gtk-3.0/gtk.css b/themes/xfce/gtk-3.0/gtk.css index 6e0f287..59b259a 100644 --- a/themes/xfce/gtk-3.0/gtk.css +++ b/themes/xfce/gtk-3.0/gtk.css @@ -419,8 +419,8 @@ GtkCalendar:selected { } .button:hover { -background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95))); -border-color: darker(#d3d7cf); +background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.95))); +border-color: darker(#cce2ff); } .button:selected { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Corrected widget name of focus-pattern property
Updating branch refs/heads/master to 82fb20dd2de8d56c5ee1539584751bebd4f583d7 (commit) from b3fafc5500e15ee0bd1cef57d80dbcb9f2688d8c (commit) commit 82fb20dd2de8d56c5ee1539584751bebd4f583d7 Author: Peter de Ridder pe...@xfce.org Date: Sun Jan 8 16:31:24 2012 +0100 Corrected widget name of focus-pattern property Xfce-4.6, Xfce themes/xfce-4.6/gtk-3.0/gtk.css |2 +- themes/xfce/gtk-3.0/gtk.css |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/xfce-4.6/gtk-3.0/gtk.css b/themes/xfce-4.6/gtk-3.0/gtk.css index 04648ed..776b222 100644 --- a/themes/xfce-4.6/gtk-3.0/gtk.css +++ b/themes/xfce-4.6/gtk-3.0/gtk.css @@ -120,7 +120,7 @@ background-color: @base_normal; border-color: darker(@bg_normal); --GtkEntry-focus-line-pattern: \0; +-GtkWidget-focus-line-pattern: \0; } .view:active, .entry:active { diff --git a/themes/xfce/gtk-3.0/gtk.css b/themes/xfce/gtk-3.0/gtk.css index 04648ed..776b222 100644 --- a/themes/xfce/gtk-3.0/gtk.css +++ b/themes/xfce/gtk-3.0/gtk.css @@ -120,7 +120,7 @@ background-color: @base_normal; border-color: darker(@bg_normal); --GtkEntry-focus-line-pattern: \0; +-GtkWidget-focus-line-pattern: \0; } .view:active, .entry:active { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Consistency with Gtk 2 for expander
Updating branch refs/heads/master to b3fafc5500e15ee0bd1cef57d80dbcb9f2688d8c (commit) from 0999214e137164d6f5d1e19f8bf9c0c0d24d1b19 (commit) commit b3fafc5500e15ee0bd1cef57d80dbcb9f2688d8c Author: Peter de Ridder pe...@xfce.org Date: Sun Jan 8 16:23:08 2012 +0100 Consistency with Gtk 2 for expander themes/b5/gtk-3.0/gtk.css| 25 + themes/cadmium/gtk-3.0/gtk.css | 25 + themes/curve/gtk-3.0/gtk.css | 25 + themes/dawn/gtk-3.0/gtk.css | 25 + themes/dusk/gtk-3.0/gtk.css | 25 + themes/kde2/gtk-3.0/gtk.css | 25 + themes/kolors/gtk-3.0/gtk.css| 25 + themes/light/gtk-3.0/gtk.css | 25 + themes/orange/gtk-3.0/gtk.css| 25 + themes/redmondxp/gtk-3.0/gtk.css | 25 + themes/saltlake/gtk-3.0/gtk.css | 25 + themes/smooth/gtk-3.0/gtk.css| 25 + themes/stellar/gtk-3.0/gtk.css | 25 + themes/winter/gtk-3.0/gtk.css| 25 + themes/xfce-4.0/gtk-3.0/gtk.css | 25 + themes/xfce-4.2/gtk-3.0/gtk.css | 25 + themes/xfce-4.4/gtk-3.0/gtk.css | 25 + themes/xfce-4.6/gtk-3.0/gtk.css | 25 + themes/xfce/gtk-3.0/gtk.css | 25 + 19 files changed, 475 insertions(+), 0 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index 3b8f50a..bc15633 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -270,6 +270,31 @@ GtkCalendar:selected { border-color: darker(@bg_normal); } +.expander { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:active { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:insensitive { +color: @base_insensitive; +border-color: @fg_insensitive; +} + +.expander:hover { +color: @fg_prelight; +border-color: @fg_prelight; +} + +.expander:selected { +color: @base_selected; +border-color: @fg_selected; +} + .slider { color: #525051; diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css index 12152fd..b8e97c5 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -281,6 +281,31 @@ GtkCalendar:selected { border-color: darker(@bg_normal); } +.expander { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:active { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:insensitive { +color: @base_insensitive; +border-color: @fg_insensitive; +} + +.expander:hover { +color: @fg_prelight; +border-color: @fg_prelight; +} + +.expander:selected { +color: @base_selected; +border-color: @fg_selected; +} + .dock, .menubar, .toolbar { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.05)), to(shade(@bg_normal, 0.95))); } diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css index 2250807..be3d538 100644 --- a/themes/curve/gtk-3.0/gtk.css +++ b/themes/curve/gtk-3.0/gtk.css @@ -294,6 +294,31 @@ GtkCalendar:selected { border-color: darker(@bg_normal); } +.expander { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:active { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:insensitive { +color: @base_insensitive; +border-color: @fg_insensitive; +} + +.expander:hover { +color: @fg_prelight; +border-color: @fg_prelight; +} + +.expander:selected { +color: @base_selected; +border-color: @fg_selected; +} + .dock:hover, .menubar:hover, .toolbar:hover { color: #ff; background-color: #4464ac; diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css index 5ab7043..ace962d 100644 --- a/themes/dawn/gtk-3.0/gtk.css +++ b/themes/dawn/gtk-3.0/gtk.css @@ -298,6 +298,31 @@ GtkCalendar:selected { border-color: darker(@bg_normal); } +.expander { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:active { +color: @base_normal; +border-color: @fg_normal; +} + +.expander:insensitive { +color: @base_insensitive; +border-color: @fg_insensitive; +} + +.expander:hover { +color: @fg_prelight; +border-color: @fg_prelight; +} + +.expander:selected { +color: @base_selected; +border-color: @fg_selected; +} + .button, .slider.horizontal { background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 1.0))); diff --git a/themes/dusk/gtk-3.0/gtk.css b/themes/dusk/gtk-3.0/gtk.css index 0f0bc12..c2cd051 100644 --- a/themes/dusk/gtk-3.0/gtk.css +++ b/themes/dusk
[Xfce4-commits] gtk-xfce-engine:master Render the spin buttons inside the entry part
Updating branch refs/heads/master to 7c69418347c59383e9542fa4562cdf4019ca3672 (commit) from 82fb20dd2de8d56c5ee1539584751bebd4f583d7 (commit) commit 7c69418347c59383e9542fa4562cdf4019ca3672 Author: Peter de Ridder pe...@xfce.org Date: Mon Feb 6 21:58:48 2012 +0100 Render the spin buttons inside the entry part Extended the entry part of the spin button and moved the spinner buttons inside. This gives more consistency with Gtk. gtk-2.0/xfce_theme_draw.c | 62 +--- gtk-3.0/xfce_engine.c | 240 + 2 files changed, 52 insertions(+), 250 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index e41dd33..56375c1 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -158,24 +158,28 @@ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateT { GradientType gradient_style = GRADIENT_VERTICAL; gfloat shade_start = 1.0, shade_end = 1.0; -gboolean draw_flat = FALSE; +gboolean draw_base = FALSE; cairo_t *cr; /* Spin buttons are a special case */ if (widget GTK_IS_SPIN_BUTTON (widget)) { -if (DETAIL(spinbutton_up) || DETAIL(spinbutton_down)) +/* The entry part needs to be completed on the background */ +if (DETAIL(spinbutton)) { +draw_base = TRUE; +} +else if (DETAIL(spinbutton_up) || DETAIL(spinbutton_down)) +{ +/* Only draw the spinner buttons if you interact with them */ if ((state_type != GTK_STATE_PRELIGHT) (state_type != GTK_STATE_ACTIVE)) -{ -draw_flat = TRUE; -} +return; } } cr = ge_gdk_drawable_to_cairo(window, area); -if ((!draw_flat) (XFCE_RC_STYLE(style-rc_style)-gradient)) +if ((!draw_base) (XFCE_RC_STYLE(style-rc_style)-gradient)) { switch (XFCE_RC_STYLE(style-rc_style)-gradient_style) { @@ -226,7 +230,7 @@ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateT } else { -gdk_cairo_set_source_color(cr, style-bg[state_type]); +gdk_cairo_set_source_color(cr, draw_base ? style-base[state_type] : style-bg[state_type]); cairo_rectangle(cr, x, y, width, height); cairo_fill(cr); } @@ -457,17 +461,27 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state /* Spin buttons are a special case */ if (widget GTK_IS_SPIN_BUTTON (widget)) { -/* GtkEntry doesn't provide the text area as frame size */ -if (DETAIL(entry)) +/* The button part of the spin button is a separate window which isn't drawn correctly */ +if (DETAIL(spinbutton)) { gint line_width = 0; gboolean interior_focus; -gdk_drawable_get_size (GTK_ENTRY(widget)-text_area, width, NULL); -if (!gtk_widget_has_focus(widget)) +if (gtk_widget_has_focus(widget)) gtk_widget_style_get(widget, focus-line-width, line_width, interior-focus, interior_focus, NULL); if (interior_focus) line_width = 0; -width += (style-xthickness + line_width) * 2; + +if (gtk_widget_get_direction(widget) != GTK_TEXT_DIR_RTL) +{ +x -= widget-allocation.width - width; +} +width = widget-allocation.width; +if (line_width) +gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height); +x += line_width; +width -= 2 * line_width; +y += line_width; +height -= 2 * line_width; } } @@ -1575,29 +1589,6 @@ static void draw_extension(GtkStyle * style, GdkWindow * window, GtkStateType st cairo_destroy(cr); } -static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint x, gint y, gint width, gint height) -{ -CHECK_ARGS; - -/* Spin buttons are a special case */ -if (widget GTK_IS_SPIN_BUTTON (widget)) -{ -/* GtkEntry doesn't provide the text area as focus size */ -if (DETAIL(entry)) -{ -gint line_width = 0; -gboolean interior_focus; -gdk_drawable_get_size (GTK_ENTRY(widget)-text_area, width, NULL); -gtk_widget_style_get (widget, focus-line-width, line_width, interior-focus, interior_focus, NULL); -if (interior_focus) -line_width = 0; -width += (style-xthickness + line_width) * 2; -} -} - -parent_class-draw_focus(style, window, state_type, area, widget, detail, x, y, width, height); -} - static void draw_slider(GtkStyle * style, GdkWindow * window, GtkStateType state_type
[Xfce4-commits] gtk-xfce-engine:master Round the location of check and radio, removing blur
Updating branch refs/heads/master to fa2177b002921d29c2b0323ee78860310ce76874 (commit) from 7c69418347c59383e9542fa4562cdf4019ca3672 (commit) commit fa2177b002921d29c2b0323ee78860310ce76874 Author: Peter de Ridder pe...@xfce.org Date: Mon Feb 6 22:02:17 2012 +0100 Round the location of check and radio, removing blur gtk-3.0/xfce_engine.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index 951bd77..123977a 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -1005,8 +1005,8 @@ static void render_check(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo GtkStateFlags state; GdkRGBA bg, border, fg; -x -= (1 + PART_SIZE - width) / 2; -y -= (1 + PART_SIZE - height) / 2; +x -= floor((1 + PART_SIZE - width) / 2); +y -= floor((1 + PART_SIZE - height) / 2); state = gtk_theming_engine_get_state(engine); gtk_theming_engine_get_background_color(engine, state, bg); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Corrected indicator-size values
Updating branch refs/heads/master to 0b76013e0c9df15a3c64d9f533da718c52fc1214 (commit) from fa2177b002921d29c2b0323ee78860310ce76874 (commit) commit 0b76013e0c9df15a3c64d9f533da718c52fc1214 Author: Peter de Ridder pe...@xfce.org Date: Mon Feb 6 22:10:54 2012 +0100 Corrected indicator-size values themes/b5/gtk-3.0/gtk.css|2 +- themes/cadmium/gtk-3.0/gtk.css |2 +- themes/curve/gtk-3.0/gtk.css |2 +- themes/dawn/gtk-3.0/gtk.css |2 +- themes/kde2/gtk-3.0/gtk.css |2 +- themes/kolors/gtk-3.0/gtk.css|4 ++-- themes/light/gtk-3.0/gtk.css |2 +- themes/orange/gtk-3.0/gtk.css|2 +- themes/redmondxp/gtk-3.0/gtk.css |2 +- themes/saltlake/gtk-3.0/gtk.css |2 +- themes/smooth/gtk-3.0/gtk.css|2 +- themes/stellar/gtk-3.0/gtk.css |2 +- themes/winter/gtk-3.0/gtk.css|2 +- themes/xfce-4.0/gtk-3.0/gtk.css |2 +- themes/xfce-4.2/gtk-3.0/gtk.css |2 +- themes/xfce-4.4/gtk-3.0/gtk.css |2 +- themes/xfce-4.6/gtk-3.0/gtk.css |4 themes/xfce/gtk-3.0/gtk.css |4 18 files changed, 17 insertions(+), 25 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index bc15633..6b386e7 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -32,7 +32,7 @@ -GtkButton-default-outside-border: 0; -GtkWidget-focus-line-width : 1; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 11; diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css index b8e97c5..eed815c 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -35,7 +35,7 @@ -GtkButton-child-displacement-y : 1; -GtkWidget-focus-line-width : 1; -GtkWidget-focus-padding : 2; --GtkCheckButton-indicator-size : 12; +-GtkCheckButton-indicator-size : 13; -GtkMenuBar-internal-padding : 0; -GtkMenuBar-shadow-type : out; -GtkPaned-handle-size: 7; diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css index be3d538..c80e03e 100644 --- a/themes/curve/gtk-3.0/gtk.css +++ b/themes/curve/gtk-3.0/gtk.css @@ -31,7 +31,7 @@ -GtkButton-default-border: 0; -GtkButton-default-outside-border: 0; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 15; diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css index ace962d..980f24c 100644 --- a/themes/dawn/gtk-3.0/gtk.css +++ b/themes/dawn/gtk-3.0/gtk.css @@ -370,5 +370,5 @@ GtkCalendar:selected { } .radio { --GtkCheckButton-indicator-size: 14; +-GtkCheckButton-indicator-size: 15; } diff --git a/themes/kde2/gtk-3.0/gtk.css b/themes/kde2/gtk-3.0/gtk.css index 4e3cbe1..6a1d7a3 100644 --- a/themes/kde2/gtk-3.0/gtk.css +++ b/themes/kde2/gtk-3.0/gtk.css @@ -31,7 +31,7 @@ -GtkButton-default-border: 0; -GtkButton-default-outside-border: 0; -GtkWidget-focus-line-width : 1; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuItem-selected-shadow-type: in; -GtkRange-slider-width : 15; -GtkRange-stepper-size : 15; diff --git a/themes/kolors/gtk-3.0/gtk.css b/themes/kolors/gtk-3.0/gtk.css index fd7c01e..4f8f371 100644 --- a/themes/kolors/gtk-3.0/gtk.css +++ b/themes/kolors/gtk-3.0/gtk.css @@ -32,7 +32,7 @@ -GtkButton-default-border: 0; -GtkButton-default-outside-border: 0; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: none; -GtkRange-slider-width : 11; @@ -179,7 +179,7 @@ GtkCalendar:selected { background-color: @base_normal; border-color: darker(@bg_normal); --GtkCheckButton-indicator-size: 10; +-GtkCheckButton-indicator-size: 11; } .check:active, .radio:active { diff --git a/themes/light/gtk-3.0/gtk.css b/themes/light/gtk-3.0/gtk.css index 9901127..7ce6f0c 100644 --- a/themes/light/gtk-3.0/gtk.css +++ b/themes/light/gtk-3.0/gtk.css @@ -32,7 +32,7 @@ -GtkButton-default-outside-border: 0; -GtkWidget-focus-line-width : 1; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: in; -GtkRange-slider-width : 15; diff --git a/themes/orange
[Xfce4-commits] gtk-xfce-engine:master Release 2.99.1!
Updating branch refs/heads/master to 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 (commit) from c51477618af859df685ff356aaa7cea858a00308 (commit) commit 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 Author: Peter de Ridder pe...@xfce.org Date: Fri Feb 10 22:49:37 2012 +0100 Release 2.99.1! NEWS|6 ++ configure.in.in |4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d09486d..ae30134 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +2.99.1 +== +- Changed rendering of GtkSpinButton. +- Pixel align checkboxes in the Gtk+-3.0 engine. +- Link against libm (bug #6253). + 2.99.0 == - Added Gtk+-3.0 theming engine. diff --git a/configure.in.in b/configure.in.in index b6d2125..1041601 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,10 +7,10 @@ dnl *** Version information *** dnl *** m4_define([gtk_xfce_engine_version_major], [2]) m4_define([gtk_xfce_engine_version_minor], [99]) -m4_define([gtk_xfce_engine_version_micro], [0]) +m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], [git]) +m4_define([gtk_xfce_engine_version_tag], []) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Correctly draw spin button without state-hint set
Updating branch refs/heads/master to c51477618af859df685ff356aaa7cea858a00308 (commit) from 0b76013e0c9df15a3c64d9f533da718c52fc1214 (commit) commit c51477618af859df685ff356aaa7cea858a00308 Author: Peter de Ridder pe...@xfce.org Date: Wed Feb 8 20:25:53 2012 +0100 Correctly draw spin button without state-hint set gtk-2.0/xfce_theme_draw.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index 56375c1..8ffc61b 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -168,6 +168,9 @@ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateT if (DETAIL(spinbutton)) { draw_base = TRUE; +/* The entry sets the background to the base state color + * This function is called with the state conditionally set according to state-hint */ +state_type = gtk_widget_get_state(widget); } else if (DETAIL(spinbutton_up) || DETAIL(spinbutton_down)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:master Post release tag bump.
Updating branch refs/heads/master to 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d (commit) from 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 (commit) commit 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d Author: Peter de Ridder pe...@xfce.org Date: Fri Feb 10 23:04:49 2012 +0100 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 1041601..7e87fef 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [99]) m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], []) +m4_define([gtk_xfce_engine_version_tag], [git]) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine|gtk-xfce-engine-2.99.1 Creating annotated tag gtk-xfce-engine-2.99.1
Updating annotated tag refs/tags/gtk-xfce-engine-2.99.1 as new annotated tag to ab8ee5afcafab6ecd06ad4b4c1c15d2f58b13684 (tag) succeeds gtk-xfce-engine-2.99.0-11-gc514776 tagged by Peter de Ridder pe...@xfce.org on 2012-02-10 22:50 +0100 Peter de Ridder (1): Release 2.99.1! ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Render the spin buttons inside the entry part
Updating branch refs/heads/peter/gtk3 to 7c69418347c59383e9542fa4562cdf4019ca3672 (commit) from 82fb20dd2de8d56c5ee1539584751bebd4f583d7 (commit) commit 7c69418347c59383e9542fa4562cdf4019ca3672 Author: Peter de Ridder pe...@xfce.org Date: Mon Feb 6 21:58:48 2012 +0100 Render the spin buttons inside the entry part Extended the entry part of the spin button and moved the spinner buttons inside. This gives more consistency with Gtk. gtk-2.0/xfce_theme_draw.c | 62 +--- gtk-3.0/xfce_engine.c | 240 + 2 files changed, 52 insertions(+), 250 deletions(-) diff --git a/gtk-2.0/xfce_theme_draw.c b/gtk-2.0/xfce_theme_draw.c index e41dd33..56375c1 100644 --- a/gtk-2.0/xfce_theme_draw.c +++ b/gtk-2.0/xfce_theme_draw.c @@ -158,24 +158,28 @@ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateT { GradientType gradient_style = GRADIENT_VERTICAL; gfloat shade_start = 1.0, shade_end = 1.0; -gboolean draw_flat = FALSE; +gboolean draw_base = FALSE; cairo_t *cr; /* Spin buttons are a special case */ if (widget GTK_IS_SPIN_BUTTON (widget)) { -if (DETAIL(spinbutton_up) || DETAIL(spinbutton_down)) +/* The entry part needs to be completed on the background */ +if (DETAIL(spinbutton)) { +draw_base = TRUE; +} +else if (DETAIL(spinbutton_up) || DETAIL(spinbutton_down)) +{ +/* Only draw the spinner buttons if you interact with them */ if ((state_type != GTK_STATE_PRELIGHT) (state_type != GTK_STATE_ACTIVE)) -{ -draw_flat = TRUE; -} +return; } } cr = ge_gdk_drawable_to_cairo(window, area); -if ((!draw_flat) (XFCE_RC_STYLE(style-rc_style)-gradient)) +if ((!draw_base) (XFCE_RC_STYLE(style-rc_style)-gradient)) { switch (XFCE_RC_STYLE(style-rc_style)-gradient_style) { @@ -226,7 +230,7 @@ static void xfce_fill_background(GtkStyle * style, GdkWindow * window, GtkStateT } else { -gdk_cairo_set_source_color(cr, style-bg[state_type]); +gdk_cairo_set_source_color(cr, draw_base ? style-base[state_type] : style-bg[state_type]); cairo_rectangle(cr, x, y, width, height); cairo_fill(cr); } @@ -457,17 +461,27 @@ static void draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state /* Spin buttons are a special case */ if (widget GTK_IS_SPIN_BUTTON (widget)) { -/* GtkEntry doesn't provide the text area as frame size */ -if (DETAIL(entry)) +/* The button part of the spin button is a separate window which isn't drawn correctly */ +if (DETAIL(spinbutton)) { gint line_width = 0; gboolean interior_focus; -gdk_drawable_get_size (GTK_ENTRY(widget)-text_area, width, NULL); -if (!gtk_widget_has_focus(widget)) +if (gtk_widget_has_focus(widget)) gtk_widget_style_get(widget, focus-line-width, line_width, interior-focus, interior_focus, NULL); if (interior_focus) line_width = 0; -width += (style-xthickness + line_width) * 2; + +if (gtk_widget_get_direction(widget) != GTK_TEXT_DIR_RTL) +{ +x -= widget-allocation.width - width; +} +width = widget-allocation.width; +if (line_width) +gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height); +x += line_width; +width -= 2 * line_width; +y += line_width; +height -= 2 * line_width; } } @@ -1575,29 +1589,6 @@ static void draw_extension(GtkStyle * style, GdkWindow * window, GtkStateType st cairo_destroy(cr); } -static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint x, gint y, gint width, gint height) -{ -CHECK_ARGS; - -/* Spin buttons are a special case */ -if (widget GTK_IS_SPIN_BUTTON (widget)) -{ -/* GtkEntry doesn't provide the text area as focus size */ -if (DETAIL(entry)) -{ -gint line_width = 0; -gboolean interior_focus; -gdk_drawable_get_size (GTK_ENTRY(widget)-text_area, width, NULL); -gtk_widget_style_get (widget, focus-line-width, line_width, interior-focus, interior_focus, NULL); -if (interior_focus) -line_width = 0; -width += (style-xthickness + line_width) * 2; -} -} - -parent_class-draw_focus(style, window, state_type, area, widget, detail, x, y, width, height); -} - static void draw_slider(GtkStyle * style, GdkWindow * window, GtkStateType state_type
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Round the location of check and radio, removing blur
Updating branch refs/heads/peter/gtk3 to fa2177b002921d29c2b0323ee78860310ce76874 (commit) from 7c69418347c59383e9542fa4562cdf4019ca3672 (commit) commit fa2177b002921d29c2b0323ee78860310ce76874 Author: Peter de Ridder pe...@xfce.org Date: Mon Feb 6 22:02:17 2012 +0100 Round the location of check and radio, removing blur gtk-3.0/xfce_engine.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c index 951bd77..123977a 100644 --- a/gtk-3.0/xfce_engine.c +++ b/gtk-3.0/xfce_engine.c @@ -1005,8 +1005,8 @@ static void render_check(GtkThemingEngine * engine, cairo_t * cr, gdouble x, gdo GtkStateFlags state; GdkRGBA bg, border, fg; -x -= (1 + PART_SIZE - width) / 2; -y -= (1 + PART_SIZE - height) / 2; +x -= floor((1 + PART_SIZE - width) / 2); +y -= floor((1 + PART_SIZE - height) / 2); state = gtk_theming_engine_get_state(engine); gtk_theming_engine_get_background_color(engine, state, bg); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Corrected indicator-size values
Updating branch refs/heads/peter/gtk3 to 0b76013e0c9df15a3c64d9f533da718c52fc1214 (commit) from fa2177b002921d29c2b0323ee78860310ce76874 (commit) commit 0b76013e0c9df15a3c64d9f533da718c52fc1214 Author: Peter de Ridder pe...@xfce.org Date: Mon Feb 6 22:10:54 2012 +0100 Corrected indicator-size values themes/b5/gtk-3.0/gtk.css|2 +- themes/cadmium/gtk-3.0/gtk.css |2 +- themes/curve/gtk-3.0/gtk.css |2 +- themes/dawn/gtk-3.0/gtk.css |2 +- themes/kde2/gtk-3.0/gtk.css |2 +- themes/kolors/gtk-3.0/gtk.css|4 ++-- themes/light/gtk-3.0/gtk.css |2 +- themes/orange/gtk-3.0/gtk.css|2 +- themes/redmondxp/gtk-3.0/gtk.css |2 +- themes/saltlake/gtk-3.0/gtk.css |2 +- themes/smooth/gtk-3.0/gtk.css|2 +- themes/stellar/gtk-3.0/gtk.css |2 +- themes/winter/gtk-3.0/gtk.css|2 +- themes/xfce-4.0/gtk-3.0/gtk.css |2 +- themes/xfce-4.2/gtk-3.0/gtk.css |2 +- themes/xfce-4.4/gtk-3.0/gtk.css |2 +- themes/xfce-4.6/gtk-3.0/gtk.css |4 themes/xfce/gtk-3.0/gtk.css |4 18 files changed, 17 insertions(+), 25 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index bc15633..6b386e7 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -32,7 +32,7 @@ -GtkButton-default-outside-border: 0; -GtkWidget-focus-line-width : 1; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 11; diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css index b8e97c5..eed815c 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -35,7 +35,7 @@ -GtkButton-child-displacement-y : 1; -GtkWidget-focus-line-width : 1; -GtkWidget-focus-padding : 2; --GtkCheckButton-indicator-size : 12; +-GtkCheckButton-indicator-size : 13; -GtkMenuBar-internal-padding : 0; -GtkMenuBar-shadow-type : out; -GtkPaned-handle-size: 7; diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css index be3d538..c80e03e 100644 --- a/themes/curve/gtk-3.0/gtk.css +++ b/themes/curve/gtk-3.0/gtk.css @@ -31,7 +31,7 @@ -GtkButton-default-border: 0; -GtkButton-default-outside-border: 0; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: out; -GtkRange-slider-width : 15; diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css index ace962d..980f24c 100644 --- a/themes/dawn/gtk-3.0/gtk.css +++ b/themes/dawn/gtk-3.0/gtk.css @@ -370,5 +370,5 @@ GtkCalendar:selected { } .radio { --GtkCheckButton-indicator-size: 14; +-GtkCheckButton-indicator-size: 15; } diff --git a/themes/kde2/gtk-3.0/gtk.css b/themes/kde2/gtk-3.0/gtk.css index 4e3cbe1..6a1d7a3 100644 --- a/themes/kde2/gtk-3.0/gtk.css +++ b/themes/kde2/gtk-3.0/gtk.css @@ -31,7 +31,7 @@ -GtkButton-default-border: 0; -GtkButton-default-outside-border: 0; -GtkWidget-focus-line-width : 1; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuItem-selected-shadow-type: in; -GtkRange-slider-width : 15; -GtkRange-stepper-size : 15; diff --git a/themes/kolors/gtk-3.0/gtk.css b/themes/kolors/gtk-3.0/gtk.css index fd7c01e..4f8f371 100644 --- a/themes/kolors/gtk-3.0/gtk.css +++ b/themes/kolors/gtk-3.0/gtk.css @@ -32,7 +32,7 @@ -GtkButton-default-border: 0; -GtkButton-default-outside-border: 0; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: none; -GtkRange-slider-width : 11; @@ -179,7 +179,7 @@ GtkCalendar:selected { background-color: @base_normal; border-color: darker(@bg_normal); --GtkCheckButton-indicator-size: 10; +-GtkCheckButton-indicator-size: 11; } .check:active, .radio:active { diff --git a/themes/light/gtk-3.0/gtk.css b/themes/light/gtk-3.0/gtk.css index 9901127..7ce6f0c 100644 --- a/themes/light/gtk-3.0/gtk.css +++ b/themes/light/gtk-3.0/gtk.css @@ -32,7 +32,7 @@ -GtkButton-default-outside-border: 0; -GtkWidget-focus-line-width : 1; -GtkWidget-focus-padding : 0; --GtkCheckButton-indicator-size : 14; +-GtkCheckButton-indicator-size : 15; -GtkMenuBar-shadow-type : out; -GtkMenuItem-selected-shadow-type: in; -GtkRange-slider-width : 15; diff --git a/themes
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Drop AC_PROG_LIBTOOL in favor of LT_PREREQ and LT_INIT
Updating branch refs/heads/peter/gtk3 to 8a6d5caf69d6b063103608277ed040768323e4e4 (commit) from e0f3335137f2a3b74cd1535338994fba3d43144e (commit) commit 8a6d5caf69d6b063103608277ed040768323e4e4 Author: Peter de Ridder pe...@xfce.org Date: Sun Dec 11 23:18:31 2011 +0100 Drop AC_PROG_LIBTOOL in favor of LT_PREREQ and LT_INIT configure.in.in |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.in.in b/configure.in.in index 59f3477..e73d192 100644 --- a/configure.in.in +++ b/configure.in.in @@ -37,11 +37,15 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl dnl *** Check for basic programs *** dnl -AC_PROG_LIBTOOL() -AC_DISABLE_STATIC() AC_PROG_CC() AC_PROG_INSTALL() +dnl * +dnl *** Check for libtool *** +dnl * +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + dnl ** dnl *** Check for standard headers *** dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Removed unused variables
Updating branch refs/heads/peter/gtk3 to b987209c2065518f6354f13883f8bc4180a251a0 (commit) from 8a6d5caf69d6b063103608277ed040768323e4e4 (commit) commit b987209c2065518f6354f13883f8bc4180a251a0 Author: Peter de Ridder pe...@xfce.org Date: Mon Dec 12 13:01:53 2011 +0100 Removed unused variables src/xfce_theme_draw.c |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c index 4635a1a..e41dd33 100644 --- a/src/xfce_theme_draw.c +++ b/src/xfce_theme_draw.c @@ -296,14 +296,10 @@ static void xfce_draw_grip_rough (GtkStyle * style, GdkWindow * window, GtkState static void xfce_draw_grip_slide (GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, gint x, gint y, gint width, gint height, GtkOrientation orientation) { -gint xthick, ythick; gint gx, gy, gwidth, gheight; cairo_t *cr; GdkColor *light, *dark, *mid, *bg; -xthick = style-xthickness; -ythick = style-ythickness; - light = style-light[state_type]; dark = style-dark[state_type]; mid = style-mid[state_type]; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Added the mkenum files to the Makefile.am
Updating branch refs/heads/peter/gtk3 to 0d511c44d6696800c42127fe7e5ddda8ba8c5e6a (commit) from ca97cba4b998dc068097016f6e2655c396151f35 (commit) commit 0d511c44d6696800c42127fe7e5ddda8ba8c5e6a Author: Peter de Ridder pe...@xfce.org Date: Sat Dec 17 16:45:40 2011 +0100 Added the mkenum files to the Makefile.am gtk-3.0/Makefile.am |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/gtk-3.0/Makefile.am b/gtk-3.0/Makefile.am index b8b425b..49091d9 100644 --- a/gtk-3.0/Makefile.am +++ b/gtk-3.0/Makefile.am @@ -37,6 +37,12 @@ libxfce_la_LDFLAGS = \ -no-undefined \ $(PLATFORM_LDFLAGS) +CLEANFILES= $(BUILT_SOURCES) + +EXTRA_DIST= \ + xfce_typebuiltin.c.template \ + xfce_typebuiltin.h.template + xfce_typebuiltin.h: xfce_style_types.h Makefile xfce_typebuiltin.h.template @( cd $(srcdir) $(GLIB_MKENUMS) --template ./xfce_typebuiltin.h.template \ ./xfce_style_types.h ) xgen-gtbh \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Release 2.99.0!
Updating branch refs/heads/peter/gtk3 to 9db1cc8b5aae8ac87553c21cb7af351356684d5f (commit) from 0d511c44d6696800c42127fe7e5ddda8ba8c5e6a (commit) commit 9db1cc8b5aae8ac87553c21cb7af351356684d5f Author: Peter de Ridder pe...@xfce.org Date: Sat Dec 17 16:59:47 2011 +0100 Release 2.99.0! NEWS|6 +- README |7 --- configure.in.in |6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index bd96cc2..d09486d 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,10 @@ +2.99.0 +== +- Added Gtk+-3.0 theming engine. + 2.9.0 = -- Changed drawing routines to use cairo +- Changed drawing routines to use cairo. 2.8.1 = diff --git a/README b/README index 87418e5..d738b8d 100644 --- a/README +++ b/README @@ -1,3 +1,4 @@ -This package provides the Xfce Gtk+-2.0 engine, which allows for homogeneity -in applications for both business and personal desktops. Minimum required -Gtk+ version is currently Gtk+-2.24.0. +This package provides the Xfce Gtk+-2.0 and Gtk+-3.0 engines, which allows +for homogeneity in applications for both business and personal desktops. +Minimum required Gtk+-2.0 version is currently Gtk+-2.20.0. +Minimum required Gtk+-3.0 version is currently Gtk+-3.0.0. diff --git a/configure.in.in b/configure.in.in index e423ad6..11d3c76 100644 --- a/configure.in.in +++ b/configure.in.in @@ -5,12 +5,12 @@ dnl dnl *** dnl *** Version information *** dnl *** -m4_define([gtk_xfce_engine_version_major], [3]) -m4_define([gtk_xfce_engine_version_minor], [0]) +m4_define([gtk_xfce_engine_version_major], [2]) +m4_define([gtk_xfce_engine_version_minor], [99]) m4_define([gtk_xfce_engine_version_micro], [0]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], [git]) +m4_define([gtk_xfce_engine_version_tag], []) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Post release tag bump.
Updating branch refs/heads/peter/gtk3 to 2d01d1235b0e8425f251da55e4cb98fcc03f5cd5 (commit) from 9db1cc8b5aae8ac87553c21cb7af351356684d5f (commit) commit 2d01d1235b0e8425f251da55e4cb98fcc03f5cd5 Author: Peter de Ridder pe...@xfce.org Date: Sat Dec 17 17:06:55 2011 +0100 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 11d3c76..d917580 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [99]) m4_define([gtk_xfce_engine_version_micro], [0]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], []) +m4_define([gtk_xfce_engine_version_tag], [git]) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Link against libm for floor() and ceil()
Updating branch refs/heads/peter/gtk3 to 0a2d889281440c78b60fb0e70ee1121e1baf148c (commit) from 2d01d1235b0e8425f251da55e4cb98fcc03f5cd5 (commit) commit 0a2d889281440c78b60fb0e70ee1121e1baf148c Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Sat Dec 17 20:38:14 2011 +0100 Link against libm for floor() and ceil() configure.in.in |3 +++ gtk-3.0/Makefile.am |3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index d917580..b6d2125 100644 --- a/configure.in.in +++ b/configure.in.in @@ -75,6 +75,9 @@ then GTK3_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` AC_SUBST([GTK3_BINARY_VERSION]) GTK_SUBDIRS=$GTK_SUBDIRS gtk-3.0 + dnl libm is needed for floor() and ceil() + AC_CHECK_LIBM + AC_SUBST(LIBM) fi AC_SUBST([GTK_SUBDIRS]) diff --git a/gtk-3.0/Makefile.am b/gtk-3.0/Makefile.am index 49091d9..e5ca000 100644 --- a/gtk-3.0/Makefile.am +++ b/gtk-3.0/Makefile.am @@ -29,7 +29,8 @@ libxfce_la_CFLAGS = \ libxfce_la_LIBADD = \ $(GTK3_LIBS) \ $(GLIB_LIBS) \ - $(GMODULE_LIBS) + $(GMODULE_LIBS) \ + $(LIBM) libxfce_la_LDFLAGS = \ -module \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits