1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

Adjusted themes main.css to get a vertically centered contentsRect.

Also adjusted mac siteicon-[secure]-bg.png to not have opaque pixels, which would cut content (e.g. Top progress bar).
Filled bar is now drawn independent of textRect.
This commit is contained in:
Franz Fellner 2012-09-30 10:55:44 +02:00
parent acfbead033
commit 63edb90cbe
8 changed files with 15 additions and 7 deletions

View File

@ -124,11 +124,12 @@ IconProvider
{
background: transparent;
border-image: url(images/lineedit-bg.png);
border-width:4;
border-width: 3px;
color:black;
padding-right: 0px;
padding-left: 0px;
padding-top: -2px;
padding-bottom: -2px;
qproperty-fixedheight: 27;
qproperty-leftMargin: 28;
}

View File

@ -134,10 +134,12 @@ IconProvider
{
background: transparent;
border-image: url(images/lineedit-bg.png);
border-width:4;
border-width: 4px;
color:black;
padding-right: -2px;
padding-left: -2px;
padding-top: -2px;
padding-bottom: -2px;
qproperty-fixedheight: 25;
qproperty-leftMargin: 35;
}

View File

@ -115,10 +115,11 @@ IconProvider
/*LocationBar*/
#locationbar
{
border-width:4;
border-width: 4px;
padding-right: -4px;
padding-left: -4px;
padding-top: -2px;
padding-bottom: -2px;
qproperty-fixedheight: 27;
qproperty-leftMargin: 26;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 958 B

After

Width:  |  Height:  |  Size: 1003 B

View File

@ -119,11 +119,12 @@ IconProvider
{
background: transparent;
border-image: url(images/lineedit-bg.png);
border-width:4;
border-width: 4px;
color:black;
padding-right: -5px;
padding-left: -5px;
padding-top: -2px;
padding-bottom: -2px;
qproperty-fixedheight: 23;
qproperty-leftMargin: 40;
}

View File

@ -129,10 +129,12 @@ IconProvider
{
background: transparent;
border-image: url(images/lineedit-bg.png);
border-width:4;
border-width: 3px;
color:black;
padding-right: -4px;
padding-left: -4px;
padding-top: -2px;
padding-bottom: -2px;
qproperty-fixedheight: 22;
qproperty-leftMargin: 29;
}

View File

@ -631,7 +631,8 @@ void LocationBar::paintEvent(QPaintEvent* event)
switch (m_progressStyle) {
case ProgressFilled: {
QRect bar = textRect.adjusted(-3, 0, 6 - (textRect.width() * (100.0 - m_loadProgress) / 100), 0);
QRect bar = contentsRect.adjusted(0, 1, 0, -1);
bar.setWidth(bar.width()*m_loadProgress/100);
const int roundness = bar.height() / 4.0;
p.drawRoundedRect(bar, roundness, roundness);
break;
@ -640,7 +641,7 @@ void LocationBar::paintEvent(QPaintEvent* event)
outlinePen.setWidthF(0.3);
outlinePen.setColor(outlinePen.color().darker(130));
p.setPen(outlinePen);
QRect bar(contentsRect.x(), contentsRect.bottom() - 2,
QRect bar(contentsRect.x(), contentsRect.bottom() - 3,
contentsRect.width()*m_loadProgress / 100.0, 3);
p.drawRoundedRect(bar, 1, 1);
break;