X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=4c1713a022306d4b7670ef3953be2a62457f85a9;hb=5f73de83d46138faa2b4c1b0a725d0a705988388;hp=ed0d7e2081a270a90894277f619f33c4daf4aeb5;hpb=878faa0c9283ee1e6e5e67b6ea1324cc52385742;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index ed0d7e2..4c1713a 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -5,8 +5,8 @@
 #include "entry.h"
 #include "graphic.h"
 #include "part.h"
+#include "slider.h"
 #include "style.h"
-#include "vslider.h"
 
 using namespace std;
 
@@ -446,18 +446,21 @@ void Entry::erase_selection(bool emit_change)
 
 void Entry::check_cursor_blink()
 {
+	const Part *cursor_part = style->get_part("cursor");
+	bool has_blink = (cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS));
+
 	cursor_blink = (state&FOCUS);
-	if((state&FOCUS) && style)
+	if((state&FOCUS) && style && has_blink)
 	{
-		const Part *cursor_part = style->get_part("cursor");
-		if(cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS))
-		{
-			set_animation_interval(Time::sec/2);
-			return;
-		}
+		set_animation_interval(Time::sec/2);
+		mark_rebuild();
+	}
+	else
+	{
+		if(has_blink)
+			mark_rebuild();
+		stop_animation();
 	}
-
-	stop_animation();
 }
 
 void Entry::check_view_range()
@@ -484,6 +487,7 @@ void Entry::check_view_range()
 		signal_scroll_position_changed.emit(first_row);
 
 	slider->set_range(0, scroll);
+	slider->set_page_size(visible_rows);
 	slider->set_value(scroll-first_row);
 }