X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Finput.c;h=8b6d4c27662d5296e4b7df1a0ec0caedf40c6b7e;hp=c740809a0f36c69a0b61e18f97bc5334ac8697de;hb=37e3cee8525bb02d3c12d75a55dd6f9c0f576861;hpb=837867b949ee959e224c5f66e66744f1e520f3e7 diff --git a/libchimara/input.c b/libchimara/input.c index c740809..8b6d4c2 100644 --- a/libchimara/input.c +++ b/libchimara/input.c @@ -27,18 +27,6 @@ request_char_event_common(winid_t win, gboolean unicode) g_signal_handler_unblock( win->widget, win->char_input_keypress_handler ); gdk_threads_enter(); - - /* - if(win->type == wintype_TextBuffer) - { - GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) ); - GtkTextIter iter; - gtk_text_buffer_get_end_iter(buffer, &iter); - gtk_text_buffer_place_cursor(buffer, &iter); - gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win->widget), gtk_text_buffer_get_insert(buffer)); - // Why doesn't this always work?? - } */ - gtk_widget_grab_focus( GTK_WIDGET(win->widget) ); gdk_threads_leave(); @@ -139,7 +127,11 @@ text_grid_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert, /* Make the entry as small as possible to fit with the text */ gtk_entry_set_has_frame(GTK_ENTRY(win->input_entry), FALSE); GtkBorder border = { 0, 0, 0, 0 }; + + /* COMPAT: */ +#if GTK_CHECK_VERSION(2,10,0) gtk_entry_set_inner_border(GTK_ENTRY(win->input_entry), &border); +#endif gtk_entry_set_max_length(GTK_ENTRY(win->input_entry), win->input_length); gtk_entry_set_width_chars(GTK_ENTRY(win->input_entry), win->input_length); @@ -193,9 +185,6 @@ text_buffer_request_line_event_common(winid_t win, glui32 maxlen, gboolean inser gtk_text_buffer_get_end_iter(buffer, &end_iter); /* update after text insertion */ } - /* Scroll to input point */ - gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win->widget), input_position); - /* Apply the correct style to the input prompt */ GtkTextIter input_iter; gtk_text_buffer_get_iter_at_mark(buffer, &input_iter, input_position);