debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set speed dial size without javascript

Browse source 
So the layout is right with and without javascript. And we
also hide the Edit and Remove buttons and options appropriately.
This commit is contained in:
Paweł Forysiuk 2011-05-04 22:45:00 +02:00 committed by Christian Dywan
parent 41a7a21683
commit b74d00abe6
2 changed files with 28 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
data/speeddial-head.html
View file

@ -37,8 +37,6 @@
float: left;
border: 1px solid #ccc;
position: relative;
width: 200px;
height: 150px;
margin: 20px 20px 0px 0px;
background-color: #fff;
-webkit-border-radius: 10px;
@ -57,7 +55,6 @@
font-size: 50px;
font-weight: bold;
margin: 0px;
height: 30px;
padding: 10px 0px 0px 0px;
display: block;
}
@ -82,8 +79,6 @@
div.shortcut a {
border: 1px solid #ccc;
display: block;
width: 160px;
height: 107px;
margin: 15px auto 0px;
background-color: #fafafa;
color: #aaa;
@ -121,7 +116,6 @@
height: 16px;
width: 16px;
margin-bottom: -17px;
margin-left: 180px;
margin-top: 2px;
background: url({stock}/1/gtk-close) 98% 70% no-repeat;
cursor: pointer;
@ -264,38 +258,6 @@
var setThumbSize = function (size)
{
var i;
var rules = document.styleSheets[0].cssRules;
var width = columns;
var height = Math.round (size / 1.5);
$('wrap').style.width = (width * (size + 60)) + 'px';
for (i = 0; i < rules.length; i++)
{
switch (rules[i].selectorText)
{
case 'div.shortcut a':
rules[i].style.width = size + 'px';
rules[i].style.height = height + 'px';
break;
case 'div.shortcut':
rules[i].style.width = (size + 40) + 'px';
rules[i].style.height = (height + 43) + 'px';
break;
case '.cross':
rules[i].style.marginLeft = (size + 20) + 'px';
break;
case 'h1':
rules[i].style.fontSize = (size / 4 + 10) + 'px';
rules[i].style.height = (size / 4 - 10) + 'px';
break;
case 'h4 span::before':
rules[i].style.visibility = (size < 160) ? 'hidden' : 'visible';
break;
}
}
console.log ("speed_dial-save-thumbsize " + size);
}

31
midori/midori-view.c
View file

@ -3953,9 +3953,34 @@ prepare_speed_dial_html (MidoriView* view)
g_free (thumb_size_type);
g_string_append_printf (markup,
"<script>var columns = %d; var rows = %d;"
"setThumbSize(%d);</script>\n",
cols, rows, thumb_size);
"<script>var columns = %d; var rows = %d;"
"setThumbSize(%d);</script>\n",
cols, rows, thumb_size);
g_string_append_printf (markup,
"<style type=\"text/css\">"
"#content div.shortcut { width: %dpx; height: %dpx; }\n"
"#content div.shortcut a { width: %dpx; height: %dpx; }\n"
"#content div.shortcut .cross { margin-left: %dpx; }\n"
"#content div.shortcut h1 { font-size: %dpx; height: %dpx; }\n"
"#wrap { width: %dpx; }\n"
"#content h4 span:before { visibility: %s; }\n</style>",
thumb_size + 40, (int)((thumb_size / 1.5) + 43),
thumb_size, (int)(thumb_size / 1.5),
thumb_size + 20,
(int)((thumb_size / 4) + 10), (int)((thumb_size / 4) - 10),
cols * (thumb_size + 60),
thumb_size < 160 ? "hidden" : "visible");
if (!katze_object_get_boolean (view->settings, "enable-scripts"))
{
g_string_append (markup,
"<style type=\"text/css\">"
"#content h4 span:before { visibility: hidden; }\n"
"div.config { visibility: hidden; }\n"
".cross { visibility:hidden; }\n"
".activated p { background-image: none; }</style>");
}
while (slot <= rows * cols)
{