[Xfce4-commits] <midori:master> Use bigger factor for large speed dials

[Christian Dywan]

Updating branch refs/heads/master
         to 242a1baf0b678b59e5e12891b3ea5302216f65ea (commit)
       from 8cfebb7dcc2b2464eccc000925386b650b81daee (commit)

commit 242a1baf0b678b59e5e12891b3ea5302216f65ea
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Fri Aug 3 21:29:46 2012 +0200

    Use bigger factor for large speed dials
    
    Fixes: https://bugs.launchpad.net/midori/+bug/904492

 midori/midori-view.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 5b13ff1..6110b11 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4224,6 +4224,7 @@ prepare_speed_dial_html (MidoriView* view,
     GKeyFile* key_file;
     GString* markup = NULL;
     guint slot_count = 1, i, grid_index = 3, slot_size;
+    guint margin, div_factor;
     gchar* speed_dial_head;
     gchar* file_path;
     gchar** groups;
@@ -4278,9 +4279,19 @@ prepare_speed_dial_html (MidoriView* view,
 
    /* Combined width of slots should always be less than 100%.
     * Use half of the remaining percentage as a margin size */
+   if (slot_size * grid_index >= 100 && grid_index > 4)
+       div_factor = 8;
+   else
+       div_factor = 2;
+
+   margin = (100 - ((slot_size - 4) * grid_index)) / div_factor;
+
+   if (margin > 9)
+       margin = margin % 10;
+
    g_string_append_printf (markup,
         "<style> body { overflow:hidden } #content { margin-left: %d%%; }</style>",
-        (100 - ((slot_size - 4) * grid_index)) / 2);
+        margin);
 
     if (katze_object_get_boolean (view->settings, "close-buttons-left"))
         g_string_append_printf (markup,