callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkTextView: Animate keybindings

Browse Source
This commit is contained in:
Matthias Clasen 2014-07-02 20:31:42 -04:00
parent 939fbc43e1
commit b04e3835cb
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtktextview.c
View File

@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkadjustmentprivate.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -2209,13 +2210,9 @@ gtk_text_view_scroll_to_iter (GtkTextView *text_view,
|| (current_x_scroll != gtk_adjustment_get_value (text_view->priv->hadjustment)); || (current_x_scroll != gtk_adjustment_get_value (text_view->priv->hadjustment));
if (retval) if (retval)
{ DV(g_print (">Actually scrolled ("G_STRLOC")\n"));
DV(g_print (">Actually scrolled ("G_STRLOC")\n"));
}
else else
{ DV(g_print (">Didn't end up scrolling ("G_STRLOC")\n"));
DV(g_print (">Didn't end up scrolling ("G_STRLOC")\n"));
}
return retval; return retval;
} }
@ -6102,7 +6099,7 @@ gtk_text_view_move_viewport (GtkTextView *text_view,
break; break;
} }
gtk_adjustment_set_value (adjustment, gtk_adjustment_get_value (adjustment) + count * increment); gtk_adjustment_animate_to_value (adjustment, gtk_adjustment_get_value (adjustment) + count * increment);
} }
static void static void
@ -6193,7 +6190,7 @@ gtk_text_view_scroll_pages (GtkTextView *text_view,
newval += count * gtk_adjustment_get_page_increment (adjustment); newval += count * gtk_adjustment_get_page_increment (adjustment);
gtk_adjustment_set_value (adjustment, newval); gtk_adjustment_animate_to_value (adjustment, newval);
cursor_y_pos += gtk_adjustment_get_value (adjustment) - oldval; cursor_y_pos += gtk_adjustment_get_value (adjustment) - oldval;
gtk_text_layout_get_iter_at_pixel (priv->layout, &new_insert, cursor_x_pos, cursor_y_pos); gtk_text_layout_get_iter_at_pixel (priv->layout, &new_insert, cursor_x_pos, cursor_y_pos);
@ -6277,7 +6274,7 @@ gtk_text_view_scroll_hpages (GtkTextView *text_view,
newval += count * gtk_adjustment_get_page_increment (adjustment); newval += count * gtk_adjustment_get_page_increment (adjustment);
gtk_adjustment_set_value (adjustment, newval); gtk_adjustment_animate_to_value (adjustment, newval);
cursor_x_pos += gtk_adjustment_get_value (adjustment) - oldval; cursor_x_pos += gtk_adjustment_get_value (adjustment) - oldval;
gtk_text_layout_get_iter_at_pixel (priv->layout, &new_insert, cursor_x_pos, cursor_y_pos); gtk_text_layout_get_iter_at_pixel (priv->layout, &new_insert, cursor_x_pos, cursor_y_pos);