AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

widget: Remove cursor-aspect-ratio style property

Browse Source
This commit is contained in:
Timm Bäder 2016-10-05 17:07:08 +02:00 committed by Benjamin Otte
parent 08c1c584b3
commit 281c1e4fe5
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtktextview.c
View File

@ -145,6 +145,7 @@
#define SCREEN_HEIGHT(widget) text_window_get_height (GTK_TEXT_VIEW (widget)->priv->text_window) #define SCREEN_HEIGHT(widget) text_window_get_height (GTK_TEXT_VIEW (widget)->priv->text_window)
#define SPACE_FOR_CURSOR 1 #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)) #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 strong;
GdkRectangle weak; GdkRectangle weak;
gboolean draw_arrow; gboolean draw_arrow;
gfloat cursor_aspect_ratio;
gint stem_width; gint stem_width;
gint arrow_width; gint arrow_width;
@ -10150,11 +10150,7 @@ text_window_invalidate_cursors (GtkTextWindow *win)
draw_arrow = (strong.x != weak.x || strong.y != weak.y); draw_arrow = (strong.x != weak.x || strong.y != weak.y);
gtk_widget_style_get (win->widget, stem_width = strong.height * CURSOR_ASPECT_RATIO + 1;
"cursor-aspect-ratio", &cursor_aspect_ratio,
NULL);
stem_width = strong.height * cursor_aspect_ratio + 1;
arrow_width = stem_width + 1; arrow_width = stem_width + 1;
strong.width = stem_width; strong.width = stem_width;
@ -10176,7 +10172,7 @@ text_window_invalidate_cursors (GtkTextWindow *win)
if (draw_arrow) /* == have weak */ 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; arrow_width = stem_width + 1;
weak.width = stem_width; weak.width = stem_width;

7
gtk/gtkwidget.c
View File

@ -3268,13 +3268,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_TYPE_WIDGET_HELP_TYPE, GTK_TYPE_WIDGET_HELP_TYPE,
GTK_WIDGET_HELP_WHATS_THIS); 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, gtk_widget_class_install_style_property (klass,
g_param_spec_boolean ("window-dragging", g_param_spec_boolean ("window-dragging",
P_("Window dragging"), P_("Window dragging"),