Fix:gui_internal Clip table containing long text lines by screen size. Fixes Prev...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4840 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/gui/internal/gui_internal.c b/navit/navit/gui/internal/gui_internal.c
index 5cf1bb1..c671717 100644 (file)
--- a/navit/navit/gui/internal/gui_internal.c
+++ b/navit/navit/gui/internal/gui_internal.c
@@ -6450,9 +6450,12 @@ void gui_internal_table_pack(struct gui_priv * this, struct widget * w)
                        count++;
                }
        }
-       if (table_data->button_box)
-               gui_internal_widget_pack(this,table_data->button_box);
 
+       w->w = width;
+       if(w->w + w->c.x > this->root.w)
+       {
+               w->w = this->root.w - w->c.x;
+       }
 
 
        if(w->h + w->c.y   > this->root.h   )
@@ -6463,7 +6466,12 @@ void gui_internal_table_pack(struct gui_priv * this, struct widget * w)
                 */
                w->h = this->root.h- w->c.y  - height;
        }
-       w->w = width;
+
+       if (table_data->button_box) 
+       {
+               gui_internal_widget_pack(this,table_data->button_box);
+       }
+
 
        /**
         * Deallocate column descriptions.