[nemiver] Var popup tip shouldn't be too small by default

[Dodji Seketeli <dodji src gnome org>]

commit 6fa173a8a73e2831e170a022ea0aba41f9bb3cd7
Author: Dodji Seketeli <dodji redhat com>
Date:   Wed Jul 29 18:39:13 2009 +0200

    Var popup tip shouldn't be too small by default
    
    	* src/persp/dbgperspective/nmv-dbg-perspective.cc:
    	(DBGPerspective::on_popup_var_insp_size_request): Don't make the
    	variable popup tip be too small for simple scalar types, otherwise
    	users are obliged to scroll to see the value for those simple
    	cases.

 src/persp/dbgperspective/nmv-dbg-perspective.cc |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 6ad1e99..99f315d 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -2512,8 +2512,8 @@ DBGPerspective::on_popup_var_insp_size_request (Gtk::Requisition *a_req,
     THROW_IF_FAIL (a_container);
 
     // These are going to be the actual width and height allocated for
-    // the container. These will be clipped (in height only, for now) later down
-    // this function, if necessary.
+    // the container. These will be clipped (in height only, for now)
+    // later down this function, if necessary.
     int width = a_req->width, height = a_req->height;
     int mouse_x = 0, mouse_y = 0;
 
@@ -2540,15 +2540,29 @@ DBGPerspective::on_popup_var_insp_size_request (Gtk::Requisition *a_req,
 
     // if the height of the container is too big so that
     // it overflows the max usable height, clip it.
+    bool clipped = false;
     if (mouse_y + height >= max_screen_height) {
         if (max_screen_height <= mouse_y)
             max_screen_height = a_container->get_screen ()->get_height ();
         height = max_screen_height - mouse_y;
+        clipped = true;
+        LOG_DD ("clipped height to: " << height);
     }
-
-    // If at some point, we remark that width might be too big as well,
+    // If at some point, if we remark that width might be too big as well,
     // we might clip width too. Though it seems unlikely for now.
 
+    if (!clipped) {
+        // Hack: we need to add some padding to take in account the extra
+        // things add by a_contained besides the content carried by
+        // the popup tip. This extra content includes things like the
+        // scrollbars etc ...
+        const int x_pad = 17, y_pad = 17;
+        width += x_pad;
+        height += y_pad;
+    }
+
+    LOG_DD ("setting scrolled window to size: ("
+            << width << "," << height << ")");
     a_container->set_size_request (width, height);
 
     NEMIVER_CATCH