From: Colin Leroy Date: Mon, 12 Sep 2005 17:32:58 +0000 (+0000) Subject: 2005-09-12 [colin] 1.9.14cvs22 X-Git-Tag: rel_1_9_15~55 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8a6983b8071c071e97a71d685de185ff6eab156c 2005-09-12 [colin] 1.9.14cvs22 * src/compose.c Fix bug #448 (Scrolling/Redraw issue with address-fields in Header) * src/mainwindow.c * src/summaryview.c * src/summaryview.h Fix loss of MSG_MARKED on move/copy Fix bug #804 (Quicksearch togglebutton doesn't get depressed after '/' key is pressed) --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 65313ad48..07d6f65d2 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,15 @@ +2005-09-12 [colin] 1.9.14cvs22 + + * src/compose.c + Fix bug #448 (Scrolling/Redraw issue with + address-fields in Header) + * src/mainwindow.c + * src/summaryview.c + * src/summaryview.h + Fix loss of MSG_MARKED on move/copy + Fix bug #804 (Quicksearch togglebutton doesn't + get depressed after '/' key is pressed) + 2005-09-12 [paul] 1.9.14cvs21 * AUTHORS diff --git a/PATCHSETS b/PATCHSETS index 3c602fff5..2f533881d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -790,3 +790,4 @@ ( cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/prefs_themes.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/description_window.c; cvs diff -u -r 1.30.2.4 -r 1.30.2.5 tools/README; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/claws.i18n.status.pl; ) > 1.9.14cvs19.patchset ( cvs diff -u -r 1.382.2.165 -r 1.382.2.166 src/compose.c; cvs diff -u -r 1.213.2.55 -r 1.213.2.56 src/folder.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/prefs_spelling.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/common/xml.c; ) > 1.9.14cvs20.patchset ( cvs diff -u -r 1.100.2.25 -r 1.100.2.26 AUTHORS; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/logwindow.c; ) > 1.9.14cvs21.patchset +( cvs diff -u -r 1.382.2.166 -r 1.382.2.167 src/compose.c; cvs diff -u -r 1.274.2.64 -r 1.274.2.65 src/mainwindow.c; cvs diff -u -r 1.395.2.122 -r 1.395.2.123 src/summaryview.c; cvs diff -u -r 1.68.2.11 -r 1.68.2.12 src/summaryview.h; ) > 1.9.14cvs22.patchset diff --git a/configure.ac b/configure.ac index 790f57ffd..d7b488c69 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=14 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=21 +EXTRA_VERSION=22 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 94db1d4cd..0b92adaf1 100644 --- a/src/compose.c +++ b/src/compose.c @@ -7293,6 +7293,28 @@ static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose) gtk_editable_set_position(GTK_EDITABLE(widget), strlen(str)); g_free(str); + if (widget->parent && widget->parent->parent + && widget->parent->parent->parent) { + if (GTK_IS_SCROLLED_WINDOW(widget->parent->parent->parent)) { + gint y = widget->allocation.y; + gint height = widget->allocation.height; + GtkAdjustment *shown = gtk_scrolled_window_get_vadjustment + (GTK_SCROLLED_WINDOW(widget->parent->parent->parent)); + + if (y < (int)shown->value) { + gtk_adjustment_set_value(GTK_ADJUSTMENT(shown), y - 1); + } + if (y + height > (int)shown->value + (int)shown->page_size) { + if (y - height - 1 < (int)shown->upper - (int)shown->page_size) { + gtk_adjustment_set_value(GTK_ADJUSTMENT(shown), + y + height - (int)shown->page_size - 1); + } else { + gtk_adjustment_set_value(GTK_ADJUSTMENT(shown), + (int)shown->upper - (int)shown->page_size - 1); + } + } + } + } } if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget)) diff --git a/src/mainwindow.c b/src/mainwindow.c index f1d90a4b2..bd9a21da3 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2502,7 +2502,7 @@ static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget) static void mainwindow_quicksearch(MainWindow *mainwin, guint action, GtkWidget *widget) { prefs_common.show_searchbar = TRUE; - quicksearch_show(mainwin->summaryview->quicksearch); + summaryview_activate_quicksearch(mainwin->summaryview); } static void toggle_folder_cb(MainWindow *mainwin, guint action, diff --git a/src/summaryview.c b/src/summaryview.c index c07e79cbb..66845287b 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -3285,10 +3285,10 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row, summaryview->copied--; } if (!MSG_IS_MOVE(msginfo->flags)) { - procmsg_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_MARKED | MSG_DELETED, MSG_COPY); + procmsg_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_DELETED, MSG_COPY); summaryview->moved++; } else { - procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY); + procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_COPY); } if (!prefs_common.immediate_exec) { @@ -3367,10 +3367,10 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row, } if (!MSG_IS_COPY(msginfo->flags)) { - procmsg_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_MARKED | MSG_DELETED, MSG_MOVE); + procmsg_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_DELETED, MSG_MOVE); summaryview->copied++; } else { - procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE); + procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE); } if (!prefs_common.immediate_exec) { summary_set_row_marks(summaryview, row); @@ -4691,6 +4691,14 @@ static void tog_searchbar_cb(GtkWidget *w, gpointer data) } } +void summaryview_activate_quicksearch(SummaryView *summaryview) +{ + gtk_toggle_button_set_active( + GTK_TOGGLE_BUTTON(summaryview->toggle_search), + TRUE); + quicksearch_show(summaryview->quicksearch); +} + static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview) { if (folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX) diff --git a/src/summaryview.h b/src/summaryview.h index b414ff33a..fa02db376 100644 --- a/src/summaryview.h +++ b/src/summaryview.h @@ -286,4 +286,5 @@ void summaryview_export_mbox_list (SummaryView *summaryview); void summaryview_lock(SummaryView *summaryview, FolderItem *item); void summaryview_unlock(SummaryView *summaryview, FolderItem *item); void summary_reflect_prefs(void); +void summaryview_activate_quicksearch(SummaryView *summaryview); #endif /* __SUMMARY_H__ */