Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 13 Apr 2024 23:58:17 UTC
Commit: 3bc2cf5efb0e6d71dccc88105658656e70282a61
https://github.com/geany/geany/commit/3bc2cf5efb0e6d71dccc88105658656e70282…
Log Message:
-----------
Fix search entry after editing the toolbar
According to b0b0ebb469a6b7eb74d321e6f5d7fe6f0bfcf6ba we guard against
proxying the widget more than once for some Windows reasons, but this
breaks the case where the same GeanyEntryAction has to re-create a
fresh proxy, like when moving the item around.
So, move the guard value to the proxied widget, not the action.
Fixes #3831.
Modified Paths:
--------------
src/geanyentryaction.c
Modified: src/geanyentryaction.c
6 lines changed, 2 insertions(+), 4 deletions(-)
===================================================================
@@ -42,7 +42,6 @@ struct _GeanyEntryActionPrivate
{
GtkWidget *entry;
gboolean numeric;
- gboolean connected;
};
enum
@@ -112,7 +111,7 @@ static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widge
GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action);
/* make sure not to connect handlers twice */
- if (! priv->connected)
+ if (! g_object_get_data(G_OBJECT(widget), "gea-connected"))
{
if (priv->numeric)
g_signal_connect(priv->entry, "insert-text",
@@ -122,7 +121,7 @@ static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widge
g_signal_connect(priv->entry, "activate-backward",
G_CALLBACK(delegate_entry_activate_backward_cb), action);
- priv->connected = TRUE;
+ g_object_set_data(G_OBJECT(widget), "gea-connected", action /* anything non-NULL */);
}
GTK_ACTION_CLASS(geany_entry_action_parent_class)->connect_proxy(action, widget);
@@ -176,7 +175,6 @@ static void geany_entry_action_init(GeanyEntryAction *action)
priv = action->priv;
priv->entry = NULL;
priv->numeric = FALSE;
- priv->connected = FALSE;
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Nick Treleaven <ntrel002(a)gmail.com>
Committer: GitHub <noreply(a)github.com>
Date: Sat, 13 Apr 2024 11:24:56 UTC
Commit: a44df8bb570e5d43f882649826e5d34ca3907a63
https://github.com/geany/geany/commit/a44df8bb570e5d43f882649826e5d34ca3907…
Log Message:
-----------
[msgwin] Reset compiler/messages treeview width at start of build/search (#3816)
* [build] Reset compiler treeview width at start of build
If the previous build had a long error message, I have to scroll to the
right. The next build is still scrolled to the right and I can't see all
the normal length messages until I manually scroll back to the left.
* Same for Find in Files, Find Usage
Modified Paths:
--------------
src/build.c
src/search.c
Modified: src/build.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -792,6 +792,8 @@ static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d
working_dir = utils_get_locale_from_utf8(utf8_working_dir);
gtk_list_store_clear(msgwindow.store_compiler);
+ // reset width after any long error messages
+ gtk_tree_view_columns_autosize(GTK_TREE_VIEW(msgwindow.tree_compiler));
gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER);
msgwin_compiler_add(COLOR_BLUE, _("%s (in directory: %s)"), cmd, utf8_working_dir);
g_free(utf8_working_dir);
Modified: src/search.c
17 lines changed, 11 insertions(+), 6 deletions(-)
===================================================================
@@ -1562,6 +1562,15 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data)
}
+static void reset_msgwin(void)
+{
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_MESSAGE);
+ gtk_list_store_clear(msgwindow.store_msg);
+ // reset width after any long messages
+ gtk_tree_view_columns_autosize(GTK_TREE_VIEW(msgwindow.tree_msg));
+}
+
+
static GString *get_grep_options(void)
{
GString *gstr = g_string_new("-nHI"); /* line numbers, filenames, ignore binaries */
@@ -1708,9 +1717,7 @@ search_find_in_files(const gchar *utf8_search_text, const gchar *utf8_dir, const
return FALSE;
}
}
-
- gtk_list_store_clear(msgwindow.store_msg);
- gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_MESSAGE);
+ reset_msgwin();
/* we can pass 'enc' without strdup'ing it here because it's a global const string and
* always exits longer than the lifetime of this function */
@@ -2214,9 +2221,7 @@ void search_find_usage(const gchar *search_text, const gchar *original_search_te
utils_beep();
return;
}
-
- gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_MESSAGE);
- gtk_list_store_clear(msgwindow.store_msg);
+ reset_msgwin();
if (! in_session)
{ /* use current document */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Nick Treleaven <ntrel002(a)gmail.com>
Committer: GitHub <noreply(a)github.com>
Date: Mon, 08 Apr 2024 09:35:38 UTC
Commit: dbaf99e3528a2f9007c4ab0ced416bdd87c22574
https://github.com/geany/geany/commit/dbaf99e3528a2f9007c4ab0ced416bdd87c22…
Log Message:
-----------
Document *Go to line* offsets (#3817)
Modified Paths:
--------------
doc/geany.txt
Modified: doc/geany.txt
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -1468,6 +1468,9 @@ Go to line
Go to a particular line number in the current file.
+If the given value starts with a plus or minus, the value will be
+interpreted as an offset from the current line.
+
Regular expressions
^^^^^^^^^^^^^^^^^^^
@@ -4775,7 +4778,7 @@ translucency
*Example:* ``translucency=256;256;false;false``
marker_line
- The style for a highlighted line (e.g when using Goto line or goto symbol).
+ The style for a highlighted line (e.g when using *Go to line* or *Go to symbol*).
The foreground color (first argument) is only used when the Markers margin
is enabled (see View menu).
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).