[Pcb-src-changes] pcb.git: branch: master updated (3738d564a82aef241d7c953d24faa8c73fc419ef)

[<gi...@gp...>]

The branch, master has been updated
       via  3738d564a82aef241d7c953d24faa8c73fc419ef (commit)
      from  b5ec76a85d0566ef536ea12eac83ba5cda615415 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/gtk/gui-pinout-window.c |    7 ++-----
 src/hid/gtk/gui-top-window.c    |    7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)


=================
 Commit Messages
=================

commit 3738d564a82aef241d7c953d24faa8c73fc419ef
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    hid/gtk: Don't pack the drawing area in a GtkViewport widget
    
    (For both the main window and the pinout preview). The GtkViewport
    widget is designed to add scroll bars to a widget which doesn't have
    native scroll capabilities. We are handling out own scroll-bars, so
    the only gain we had from the GtkViewport we added was a shadow
    around the widget.
    
    If we decide we want the shadow back, a more appropriate widget to
    pack the drawing area with might be a GtkFrame.

:100644 100644 8bd7193... 5b0feef... M	src/hid/gtk/gui-pinout-window.c
:100644 100644 1aab00e... 95f39a2... M	src/hid/gtk/gui-top-window.c

=========
 Changes
=========

commit 3738d564a82aef241d7c953d24faa8c73fc419ef
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    hid/gtk: Don't pack the drawing area in a GtkViewport widget
    
    (For both the main window and the pinout preview). The GtkViewport
    widget is designed to add scroll bars to a widget which doesn't have
    native scroll capabilities. We are handling out own scroll-bars, so
    the only gain we had from the GtkViewport we added was a shadow
    around the widget.
    
    If we decide we want the shadow back, a more appropriate widget to
    pack the drawing area with might be a GtkFrame.

diff --git a/src/hid/gtk/gui-pinout-window.c b/src/hid/gtk/gui-pinout-window.c
index 8bd7193..5b0feef 100644
--- a/src/hid/gtk/gui-pinout-window.c
+++ b/src/hid/gtk/gui-pinout-window.c
@@ -62,7 +62,7 @@ pinout_close_cb (GtkWidget * widget, GtkWidget *top_window)
 void
 ghid_pinout_window_show (GHidPort * out, ElementType * element)
 {
-  GtkWidget *button, *viewport, *vbox, *hbox, *preview, *top_window;
+  GtkWidget *button, *vbox, *hbox, *preview, *top_window;
   gchar *title;
   int width, height;
 
@@ -82,12 +82,9 @@ ghid_pinout_window_show (GHidPort * out, ElementType * element)
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (top_window), vbox);
 
-  viewport = gtk_viewport_new (NULL, NULL);
-  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), viewport, TRUE, TRUE, 0);
 
   preview = ghid_pinout_preview_new (element);
-  gtk_container_add (GTK_CONTAINER (viewport), preview);
+  gtk_box_pack_start (GTK_BOX (vbox), preview, TRUE, TRUE, 0);
 
   ghid_pinout_preview_get_natural_size (GHID_PINOUT_PREVIEW (preview),
                                         &width, &height);
diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c
index 1aab00e..95f39a2 100644
--- a/src/hid/gtk/gui-top-window.c
+++ b/src/hid/gtk/gui-top-window.c
@@ -1209,7 +1209,7 @@ ghid_build_pcb_top_window (void)
 {
   GtkWidget *window;
   GtkWidget *vbox_main, *vbox_left, *hbox_middle, *hbox;
-  GtkWidget *viewport, *ebox, *vbox, *frame;
+  GtkWidget *ebox, *vbox, *frame;
   GtkWidget *label;
   GHidPort *port = &ghid_port;
   gchar *s;
@@ -1352,9 +1352,6 @@ ghid_build_pcb_top_window (void)
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
   /* -- The PCB layout output drawing area */
-  viewport = gtk_viewport_new (NULL, NULL);
-  gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), viewport, TRUE, TRUE, 0);
 
   gport->drawing_area = gtk_drawing_area_new ();
   ghid_init_drawing_widget (gport->drawing_area, gport);
@@ -1373,7 +1370,7 @@ ghid_build_pcb_top_window (void)
    */
   GTK_WIDGET_SET_FLAGS (gport->drawing_area, GTK_CAN_FOCUS);
 
-  gtk_container_add (GTK_CONTAINER (viewport), gport->drawing_area);
+  gtk_box_pack_start (GTK_BOX (hbox), gport->drawing_area, TRUE, TRUE, 0);
 
   ghidgui->v_adjustment = gtk_adjustment_new (0.0, 0.0, 100.0,
 					      10.0, 10.0, 10.0);