Merge lp:~kalikiana/midori/largerdialog into lp:midori

[Cris Dywan]

Define large dialog icon size relative to dialog icon size

[Cris Dywan (kalikiana)]

Would this be seen as a bug fix? Though I guess it's not super critical so we might also wait for after release.

[André Stösel (ivaldi)]

Looks good!

review: Approve

=== modified file 'data/about.css'
--- data/about.css	2013-06-29 22:38:04 +0000
+++ data/about.css	2013-07-07 08:02:26 +0000
@@ -19,7 +19,7 @@
 }
 
 .indent {
-    margin-left: 60px;
+    margin-left: 5%;
 }
 
 #main {
@@ -38,7 +38,7 @@
 }
 
 #text {
-    margin-left: 80px;
+    margin-left: 15%;
 }
 
 h1 {

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-07-01 20:20:33 +0000
+++ midori/midori-view.c	2013-07-07 08:02:26 +0000
@@ -886,7 +886,11 @@
         static gint icon_size_large_dialog = 0;
 
         if (!icon_size_large_dialog)
-            icon_size_large_dialog = gtk_icon_size_register ("large-dialog", 64, 64);
+        {
+            gint width = 48, height = 48;
+            gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &width, &height);
+            icon_size_large_dialog = gtk_icon_size_register ("large-dialog", width * 2, height * 2);
+        }
 
         if (g_ascii_isalpha (icon_name[0]))
         {