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

textview: always use interior focus

Browse Source
This commit is contained in:
Cosimo Cecchi 2014-05-01 19:35:58 +02:00
parent 5a16ec366d
commit a3cbcc6451
1 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gtk/gtktextview.c
View File

@ -356,8 +356,6 @@ static gint gtk_text_view_motion_event (GtkWidget *widget,
GdkEventMotion *event); GdkEventMotion *event);
static gint gtk_text_view_draw (GtkWidget *widget, static gint gtk_text_view_draw (GtkWidget *widget,
cairo_t *cr); cairo_t *cr);
static void gtk_text_view_draw_focus (GtkWidget *widget,
cairo_t *cr);
static gboolean gtk_text_view_focus (GtkWidget *widget, static gboolean gtk_text_view_focus (GtkWidget *widget,
GtkDirectionType direction); GtkDirectionType direction);
static void gtk_text_view_select_all (GtkWidget *widget, static void gtk_text_view_select_all (GtkWidget *widget,
@ -3495,24 +3493,11 @@ gtk_text_view_size_request (GtkWidget *widget,
GtkTextView *text_view; GtkTextView *text_view;
GtkTextViewPrivate *priv; GtkTextViewPrivate *priv;
GSList *tmp_list; GSList *tmp_list;
gint focus_edge_width;
gint focus_width;
guint border_width; guint border_width;
gboolean interior_focus;
text_view = GTK_TEXT_VIEW (widget); text_view = GTK_TEXT_VIEW (widget);
priv = text_view->priv; priv = text_view->priv;
gtk_widget_style_get (widget,
"interior-focus", &interior_focus,
"focus-line-width", &focus_width,
NULL);
if (interior_focus)
focus_edge_width = 0;
else
focus_edge_width = focus_width;
if (priv->layout) if (priv->layout)
{ {
priv->text_window->requisition.width = priv->layout->width; priv->text_window->requisition.width = priv->layout->width;
@ -3524,8 +3509,8 @@ gtk_text_view_size_request (GtkWidget *widget,
priv->text_window->requisition.height = 0; priv->text_window->requisition.height = 0;
} }
requisition->width = priv->text_window->requisition.width + focus_edge_width * 2; requisition->width = priv->text_window->requisition.width;
requisition->height = priv->text_window->requisition.height + focus_edge_width * 2; requisition->height = priv->text_window->requisition.height;
if (priv->left_window) if (priv->left_window)
requisition->width += priv->left_window->requisition.width; requisition->width += priv->left_window->requisition.width;
@ -3761,10 +3746,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
GdkRectangle right_rect; GdkRectangle right_rect;
GdkRectangle top_rect; GdkRectangle top_rect;
GdkRectangle bottom_rect; GdkRectangle bottom_rect;
gint focus_edge_width;
gint focus_width;
guint border_width; guint border_width;
gboolean interior_focus;
gboolean size_changed; gboolean size_changed;
text_view = GTK_TEXT_VIEW (widget); text_view = GTK_TEXT_VIEW (widget);
@ -3795,17 +3777,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
* windows get at least a 1x1 allocation. * windows get at least a 1x1 allocation.
*/ */
gtk_widget_style_get (widget, width = allocation->width - border_width * 2;
"interior-focus", &interior_focus,
"focus-line-width", &focus_width,
NULL);
if (interior_focus)
focus_edge_width = 0;
else
focus_edge_width = focus_width;
width = allocation->width - focus_edge_width * 2 - border_width * 2;
if (priv->left_window) if (priv->left_window)
left_rect.width = priv->left_window->requisition.width; left_rect.width = priv->left_window->requisition.width;
@ -3826,8 +3798,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
top_rect.width = text_rect.width; top_rect.width = text_rect.width;
bottom_rect.width = text_rect.width; bottom_rect.width = text_rect.width;
height = allocation->height - border_width * 2;
height = allocation->height - focus_edge_width * 2 - border_width * 2;
if (priv->top_window) if (priv->top_window)
top_rect.height = priv->top_window->requisition.height; top_rect.height = priv->top_window->requisition.height;
@ -3849,8 +3820,8 @@ gtk_text_view_size_allocate (GtkWidget *widget,
right_rect.height = text_rect.height; right_rect.height = text_rect.height;
/* Origins */ /* Origins */
left_rect.x = focus_edge_width + border_width; left_rect.x = border_width;
top_rect.y = focus_edge_width + border_width; top_rect.y = border_width;
text_rect.x = left_rect.x + left_rect.width; text_rect.x = left_rect.x + left_rect.width;
text_rect.y = top_rect.y + top_rect.height; text_rect.y = top_rect.y + top_rect.height;
@ -5422,8 +5393,6 @@ gtk_text_view_draw (GtkWidget *widget,
gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_width (widget),
gtk_widget_get_allocated_height (widget)); gtk_widget_get_allocated_height (widget));
gtk_style_context_restore (context); gtk_style_context_restore (context);
gtk_text_view_draw_focus (widget, cr);
} }
window = gtk_text_view_get_window (GTK_TEXT_VIEW (widget), window = gtk_text_view_get_window (GTK_TEXT_VIEW (widget),
@ -5477,29 +5446,6 @@ gtk_text_view_draw (GtkWidget *widget,
return FALSE; return FALSE;
} }
static void
gtk_text_view_draw_focus (GtkWidget *widget,
cairo_t *cr)
{
gboolean interior_focus;
/* We clear the focus if we are in interior focus mode. */
gtk_widget_style_get (widget,
"interior-focus", &interior_focus,
NULL);
if (gtk_widget_has_visible_focus (widget) && !interior_focus)
{
GtkStyleContext *context;
context = gtk_widget_get_style_context (widget);
gtk_render_focus (context, cr, 0, 0,
gtk_widget_get_allocated_width (widget),
gtk_widget_get_allocated_height (widget));
}
}
static gboolean static gboolean
gtk_text_view_focus (GtkWidget *widget, gtk_text_view_focus (GtkWidget *widget,
GtkDirectionType direction) GtkDirectionType direction)