[gnome-panel/wip/muktupavels/remove-drag-source] button-widget: remove unused has-arrow property
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/wip/muktupavels/remove-drag-source] button-widget: remove unused has-arrow property
- Date: Sun, 12 Apr 2020 22:59:53 +0000 (UTC)
commit 8d60788c51dffc9c367217864e0d68b8d558867d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Mon Apr 13 01:58:25 2020 +0300
button-widget: remove unused has-arrow property
Last user was main menu button that was removed in b193419a01ce82.
gnome-panel/button-widget.c | 105 --------------------------------------------
gnome-panel/button-widget.h | 3 --
gnome-panel/launcher.c | 1 -
3 files changed, 109 deletions(-)
---
diff --git a/gnome-panel/button-widget.c b/gnome-panel/button-widget.c
index 8d2eb9a1f..e223805ab 100644
--- a/gnome-panel/button-widget.c
+++ b/gnome-panel/button-widget.c
@@ -25,7 +25,6 @@ struct _ButtonWidgetPrivate {
int size;
guint activatable : 1;
- guint arrow : 1;
guint dnd_highlight : 1;
};
@@ -35,7 +34,6 @@ static void button_widget_reload_pixbuf (ButtonWidget *button);
enum {
PROP_0,
PROP_ACTIVATABLE,
- PROP_HAS_ARROW,
PROP_DND_HIGHLIGHT,
PROP_ORIENTATION,
PROP_ICON_NAME
@@ -215,9 +213,6 @@ button_widget_get_property (GObject *object,
case PROP_ACTIVATABLE:
g_value_set_boolean (value, button->priv->activatable);
break;
- case PROP_HAS_ARROW:
- g_value_set_boolean (value, button->priv->arrow);
- break;
case PROP_DND_HIGHLIGHT:
g_value_set_boolean (value, button->priv->dnd_highlight);
break;
@@ -247,9 +242,6 @@ button_widget_set_property (GObject *object,
case PROP_ACTIVATABLE:
button_widget_set_activatable (button, g_value_get_boolean (value));
break;
- case PROP_HAS_ARROW:
- button_widget_set_has_arrow (button, g_value_get_boolean (value));
- break;
case PROP_DND_HIGHLIGHT:
button_widget_set_dnd_highlight (button, g_value_get_boolean (value));
break;
@@ -265,55 +257,6 @@ button_widget_set_property (GObject *object,
}
}
-static GtkArrowType
-calc_arrow (PanelOrientation orientation,
- int button_width,
- int button_height,
- int *x,
- int *y,
- gdouble *angle,
- gdouble *size)
-{
- GtkArrowType retval = GTK_ARROW_UP;
- double scale;
-
- scale = (orientation & PANEL_HORIZONTAL_MASK ? button_height : button_width) / 48.0;
-
- *size = 12 * scale;
- *angle = 0;
-
- switch (orientation) {
- case PANEL_ORIENTATION_TOP:
- *x = scale * 3;
- *y = scale * (48 - 13);
- *angle = G_PI;
- retval = GTK_ARROW_DOWN;
- break;
- case PANEL_ORIENTATION_BOTTOM:
- *x = scale * (48 - 13);
- *y = scale * 1;
- *angle = 0;
- retval = GTK_ARROW_UP;
- break;
- case PANEL_ORIENTATION_LEFT:
- *x = scale * (48 - 13);
- *y = scale * 3;
- *angle = G_PI / 2;
- retval = GTK_ARROW_RIGHT;
- break;
- case PANEL_ORIENTATION_RIGHT:
- *x = scale * 1;
- *y = scale * 3;
- *angle = 3 * (G_PI / 2);
- retval = GTK_ARROW_LEFT;
- break;
- default:
- break;
- }
-
- return retval;
-}
-
static gboolean
button_widget_draw (GtkWidget *widget,
cairo_t *cr)
@@ -370,24 +313,6 @@ button_widget_draw (GtkWidget *widget,
context = gtk_widget_get_style_context (widget);
- if (button_widget->priv->arrow) {
- gdouble angle, size;
-
- gtk_style_context_save (context);
- gtk_style_context_set_state (context, state_flags);
-
- calc_arrow (button_widget->priv->orientation,
- width, height,
- &x, &y,
- &angle, &size);
-
- cairo_save (cr);
- gtk_render_arrow (context, cr, angle, x, y, size);
- cairo_restore (cr);
-
- gtk_style_context_restore (context);
- }
-
if (button_widget->priv->dnd_highlight) {
cairo_save (cr);
cairo_set_line_width (cr, 1);
@@ -608,7 +533,6 @@ button_widget_init (ButtonWidget *button)
button->priv->size = 0;
button->priv->activatable = FALSE;
- button->priv->arrow = FALSE;
button->priv->dnd_highlight = FALSE;
}
@@ -644,15 +568,6 @@ button_widget_class_init (ButtonWidgetClass *klass)
TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
- g_object_class_install_property (
- gobject_class,
- PROP_HAS_ARROW,
- g_param_spec_boolean ("has-arrow",
- "Has Arrow",
- "Whether or not to draw an arrow indicator",
- FALSE,
- G_PARAM_READWRITE));
-
g_object_class_install_property (
gobject_class,
PROP_DND_HIGHLIGHT,
@@ -692,14 +607,12 @@ button_widget_class_init (ButtonWidgetClass *klass)
GtkWidget *
button_widget_new (const char *filename,
- gboolean arrow,
PanelOrientation orientation)
{
GtkWidget *retval;
retval = g_object_new (
BUTTON_TYPE_WIDGET,
- "has-arrow", arrow,
"orientation", orientation,
"icon-name", filename,
NULL);
@@ -783,24 +696,6 @@ button_widget_get_orientation (ButtonWidget *button)
return button->priv->orientation;
}
-void
-button_widget_set_has_arrow (ButtonWidget *button,
- gboolean has_arrow)
-{
- g_return_if_fail (BUTTON_IS_WIDGET (button));
-
- has_arrow = has_arrow != FALSE;
-
- if (button->priv->arrow == has_arrow)
- return;
-
- button->priv->arrow = has_arrow;
-
- gtk_widget_queue_draw (GTK_WIDGET (button));
-
- g_object_notify (G_OBJECT (button), "has-arrow");
-}
-
void
button_widget_set_dnd_highlight (ButtonWidget *button,
gboolean dnd_highlight)
diff --git a/gnome-panel/button-widget.h b/gnome-panel/button-widget.h
index b72f74776..dc87fd3d1 100644
--- a/gnome-panel/button-widget.h
+++ b/gnome-panel/button-widget.h
@@ -28,7 +28,6 @@ struct _ButtonWidgetClass {
GType button_widget_get_type (void) G_GNUC_CONST;
GtkWidget * button_widget_new (const char *pixmap,
- gboolean arrow,
PanelOrientation orientation);
void button_widget_set_activatable (ButtonWidget *button,
gboolean activatable);
@@ -37,8 +36,6 @@ void button_widget_set_icon_name (ButtonWidget *button,
void button_widget_set_orientation (ButtonWidget *button,
PanelOrientation orientation);
PanelOrientation button_widget_get_orientation (ButtonWidget *button);
-void button_widget_set_has_arrow (ButtonWidget *button,
- gboolean has_arrow);
void button_widget_set_dnd_highlight (ButtonWidget *button,
gboolean dnd_highlight);
GtkIconTheme *button_widget_get_icon_theme (ButtonWidget *button);
diff --git a/gnome-panel/launcher.c b/gnome-panel/launcher.c
index 2db8585ab..b1cd9f0f5 100644
--- a/gnome-panel/launcher.c
+++ b/gnome-panel/launcher.c
@@ -651,7 +651,6 @@ create_launcher (const char *location)
/* Icon will be setup later */
launcher->button = button_widget_new (NULL /* icon */,
- FALSE,
PANEL_ORIENTATION_TOP);
gtk_widget_show (launcher->button);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]