[gnome-builder] libide: shrink should animate to cursor when multiline
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] libide: shrink should animate to cursor when multiline
- Date: Tue, 24 Mar 2015 00:03:51 +0000 (UTC)
commit 6cbf5053f28630a984a9af344cd202ca8d4e5ae4
Author: Christian Hergert <christian hergert me>
Date: Fri Mar 6 13:26:20 2015 -0800
libide: shrink should animate to cursor when multiline
libide/ide-source-view.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/libide/ide-source-view.c b/libide/ide-source-view.c
index 7bf4533..5fe3387 100644
--- a/libide/ide-source-view.c
+++ b/libide/ide-source-view.c
@@ -309,6 +309,7 @@ animate_shrink (IdeSourceView *self,
IdeBoxTheatric *theatric;
GtkAllocation alloc;
GdkRectangle rect = { 0 };
+ GdkRectangle char_rect = { 0 };
GtkTextIter copy_begin;
GtkTextIter copy_end;
gboolean is_whole_line;
@@ -318,6 +319,7 @@ animate_shrink (IdeSourceView *self,
g_assert (begin);
g_assert (end);
+ get_rect_for_iters (GTK_TEXT_VIEW (self), begin, begin, &char_rect, GTK_TEXT_WINDOW_WIDGET);
get_rect_for_iters (GTK_TEXT_VIEW (self), begin, end, &rect, GTK_TEXT_WINDOW_WIDGET);
gtk_widget_get_allocation (GTK_WIDGET (self), &alloc);
rect.height = MIN (rect.height, alloc.height - rect.y);
@@ -372,14 +374,14 @@ animate_shrink (IdeSourceView *self,
else
ide_object_animate_full (theatric,
IDE_ANIMATION_EASE_OUT_QUAD,
- 250,
+ 150,
gtk_widget_get_frame_clock (GTK_WIDGET (self)),
g_object_unref,
theatric,
- "x", rect.x + (rect.width / 2),
+ "x", rect.x,
"width", 0,
- "y", rect.y + (rect.height / 2),
- "height", 0,
+ "y", rect.y,
+ "height", char_rect.height,
"alpha", 0.3,
NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]