[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request: Account for the SVG margins in FolderView::IconView::itemSize()
From: "Ignat Semenov" <13thguards () gmail ! com>
Date: 2012-01-19 20:34:06
Message-ID: 20120119203406.14372.78041 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
> On Jan. 19, 2012, 5:24 p.m., Aaron J. Seigo wrote:
> > small comment below, but looks ok otherwise.
I think qRound() should go away, as per diff r2, because the code for the size calc \
based on the icon size a few lines above does not do this. If we qRound() the sum of \
the margins, we could end up getting a pixel more than the first version. What do you \
think?
> On Jan. 19, 2012, 5:24 p.m., Aaron J. Seigo wrote:
> > plasma/applets/folderview/iconview.cpp, lines 1011-1012
> > <http://git.reviewboard.kde.org/r/103735/diff/3/?file=47478#file47478line1011>
> >
> > hm can be cons. also, spaces around the + signs, please
Will do.
- Ignat
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/103735/#review9953
-----------------------------------------------------------
On Jan. 19, 2012, 2:38 p.m., Ignat Semenov wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/103735/
> -----------------------------------------------------------
>
> (Updated Jan. 19, 2012, 2:38 p.m.)
>
>
> Review request for Plasma, Aaron J. Seigo and Marco Martin.
>
>
> Description
> -------
>
> Currently, the FolderView::IconView::itemSize() method accounts for the margins \
> only if size.width()>ts.width(), that is, the icon+margins is wider than the text. \
> However, when ts.width()>size.width(), the margins are not accounted for, and \
> size.width()=ts.width(). This can be observed easily. The patch adds those margins \
> to the second operand of the comparison macro.
>
> Diffs
> -----
>
> plasma/applets/folderview/iconview.cpp 09b9c80
>
> Diff: http://git.reviewboard.kde.org/r/103735/diff/diff
>
>
> Testing
> -------
>
> Tested by manually changing the paintItem() code to use the itemSize() rect and \
> observing the improved behaviour.
>
> Thanks,
>
> Ignat Semenov
>
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/103735/">http://git.reviewboard.kde.org/r/103735/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On January 19th, 2012, 5:24 p.m., <b>Aaron J. \
Seigo</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;"> <pre style="white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">small comment below, but looks ok otherwise.</pre> </blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I think qRound() should \
go away, as per diff r2, because the code for the size calc based on the icon size a \
few lines above does not do this. If we qRound() the sum of the margins, we could end \
up getting a pixel more than the first version. What do you think?</pre> <br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On January 19th, 2012, 5:24 p.m., <b>Aaron J. \
Seigo</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/103735/diff/3/?file=47478#file47478line1011" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plasma/applets/folderview/iconview.cpp</a> <span style="font-weight: \
normal;">
(Diff revision 3)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">QSize \
IconView::itemSize(const QStyleOptionViewItemV4 &option, const QModelIndex \
&index) const</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">1011</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">size</span><span class="p">.</span><span class="n">rwidth</span><span \
class="p">()</span> <span class="o">=</span> <span class="n">qMax</span><span \
class="p">(</span><span class="n">size</span><span class="p">.</span><span \
class="n">width</span><span class="p">(),</span> <span class="n">ts</span><span \
class="p">.</span><span class="n">width</span><span class="p">());</span></pre></td> \
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1011</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="kt">int</span> <span class="n">hm</span> <span class="o">=</span> <span \
class="n">qRound</span><span class="p">(</span><span class="n">left</span><span \
class="o">+</span><span class="n">right</span><span class="p">);</span></pre></td> \
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1012</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">size</span><span class="p">.</span><span class="n">rwidth</span><span \
class="p">()</span> <span class="o">=</span> <span class="n">qMax</span><span \
class="p">(</span><span class="n">size</span><span class="p">.</span><span \
class="n">width</span><span class="p">(),</span> <span class="n">ts</span><span \
class="p">.</span><span class="n">width</span><span class="p">()</span><span \
class="o">+</span><span class="n">hm</span><span class="p">);</span></pre></td> \
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">hm can be cons. also, \
spaces around the + signs, please</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Will \
do.</pre> <br />
<p>- Ignat</p>
<br />
<p>On January 19th, 2012, 2:38 p.m., Ignat Semenov wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for Plasma, Aaron J. Seigo and Marco Martin.</div>
<div>By Ignat Semenov.</div>
<p style="color: grey;"><i>Updated Jan. 19, 2012, 2:38 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Currently, the FolderView::IconView::itemSize() method accounts for the \
margins only if size.width()>ts.width(), that is, the icon+margins is wider than \
the text. However, when ts.width()>size.width(), the margins are not accounted \
for, and size.width()=ts.width(). This can be observed easily. The patch adds those \
margins to the second operand of the comparison macro.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Tested by manually changing the paintItem() code to use the itemSize() \
rect and observing the improved behaviour.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>plasma/applets/folderview/iconview.cpp <span style="color: \
grey">(09b9c80)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/103735/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic