[ghex] hexwidget: Disallow keyboard shortcuts to activate hidden panes



commit 6d368e52ebd16b4751411acfcfa27a2d5bda5d38
Author: Logan Rathbone <poprocks gmail com>
Date:   Tue May 3 03:02:25 2022 -0400

    hexwidget: Disallow keyboard shortcuts to activate hidden panes

 src/gtkhex.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/src/gtkhex.c b/src/gtkhex.c
index f1ebe78..677b3e3 100644
--- a/src/gtkhex.c
+++ b/src/gtkhex.c
@@ -334,8 +334,11 @@ toggle_hex_action (GtkWidget *widget,
 {
        HexWidget *self = HEX_WIDGET (widget);
 
-       self->active_view = VIEW_HEX;
-       gtk_widget_queue_draw (widget);
+       if (gtk_widget_get_visible (self->xdisp))
+       {
+               self->active_view = VIEW_HEX;
+               gtk_widget_queue_draw (widget);
+       }
 }
 
 static void
@@ -345,8 +348,11 @@ toggle_ascii_action (GtkWidget *widget,
 {
        HexWidget *self = HEX_WIDGET (widget);
 
-       self->active_view = VIEW_ASCII;
-       gtk_widget_queue_draw (widget);
+       if (gtk_widget_get_visible (self->adisp))
+       {
+               self->active_view = VIEW_ASCII;
+               gtk_widget_queue_draw (widget);
+       }
 }
 
 /*
@@ -3297,6 +3303,9 @@ hex_widget_show_hex_column (HexWidget *self, gboolean show)
 {
        g_return_if_fail (HEX_IS_WIDGET (self));
 
+       if (!show && gtk_widget_get_visible (self->adisp))
+               self->active_view = VIEW_ASCII;
+
        gtk_widget_set_visible (self->xdisp, show);
 }
 
@@ -3314,6 +3323,9 @@ hex_widget_show_ascii_column (HexWidget *self, gboolean show)
 {
        g_return_if_fail (HEX_IS_WIDGET (self));
 
+       if (!show && gtk_widget_get_visible (self->xdisp))
+               self->active_view = VIEW_HEX;
+
        gtk_widget_set_visible (self->adisp, show);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]