summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2016-10-05 17:07:08 +0200
committerBenjamin Otte <otte@redhat.com>2016-10-16 18:17:21 +0200
commit281c1e4fe547973df320c68836713b9ecd3f9688 (patch)
treeee64bcdc536c4a3881284ca00b6703a2bf941745
parent08c1c584b3c9644bf96968437cf55d816c8ef5b0 (diff)
downloadgtk+-281c1e4fe547973df320c68836713b9ecd3f9688.tar.gz
widget: Remove cursor-aspect-ratio style property
-rw-r--r--gtk/gtktextview.c10
-rw-r--r--gtk/gtkwidget.c7
2 files changed, 3 insertions, 14 deletions
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index f6be78bfe8..191deaa313 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -145,6 +145,7 @@
#define SCREEN_HEIGHT(widget) text_window_get_height (GTK_TEXT_VIEW (widget)->priv->text_window)
#define SPACE_FOR_CURSOR 1
+#define CURSOR_ASPECT_RATIO (0.04)
#define GTK_TEXT_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TEXT_VIEW, GtkTextViewPrivate))
@@ -10125,7 +10126,6 @@ text_window_invalidate_cursors (GtkTextWindow *win)
GdkRectangle strong;
GdkRectangle weak;
gboolean draw_arrow;
- gfloat cursor_aspect_ratio;
gint stem_width;
gint arrow_width;
@@ -10150,11 +10150,7 @@ text_window_invalidate_cursors (GtkTextWindow *win)
draw_arrow = (strong.x != weak.x || strong.y != weak.y);
- gtk_widget_style_get (win->widget,
- "cursor-aspect-ratio", &cursor_aspect_ratio,
- NULL);
-
- stem_width = strong.height * cursor_aspect_ratio + 1;
+ stem_width = strong.height * CURSOR_ASPECT_RATIO + 1;
arrow_width = stem_width + 1;
strong.width = stem_width;
@@ -10176,7 +10172,7 @@ text_window_invalidate_cursors (GtkTextWindow *win)
if (draw_arrow) /* == have weak */
{
- stem_width = weak.height * cursor_aspect_ratio + 1;
+ stem_width = weak.height * CURSOR_ASPECT_RATIO + 1;
arrow_width = stem_width + 1;
weak.width = stem_width;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 17cb60ddc4..bb2d70b1a9 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3269,13 +3269,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_WIDGET_HELP_WHATS_THIS);
gtk_widget_class_install_style_property (klass,
- g_param_spec_float ("cursor-aspect-ratio",
- P_("Cursor line aspect ratio"),
- P_("Aspect ratio with which to draw insertion cursor"),
- 0.0, 1.0, 0.04,
- GTK_PARAM_READABLE));
-
- gtk_widget_class_install_style_property (klass,
g_param_spec_boolean ("window-dragging",
P_("Window dragging"),
P_("Whether windows can be dragged and maximized by clicking on empty areas"),