[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request 122673: Make Svg, FrameSvg work qith QT_DEVICE_PIXELRATIO
From: "David Edmundson" <david () davidedmundson ! co ! uk>
Date: 2015-03-04 14:10:33
Message-ID: 20150304141033.6756.93825 () probe ! kde ! org
[Download RAW message or body]
--===============5178218386714640274==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/122673/#review77000
-----------------------------------------------------------
src/plasma/framesvg.cpp
<https://git.reviewboard.kde.org/r/122673/#comment52958>
we need to setDevicePixelRatio on this, otherwise any app that tries to paint a \
FrameSvg::Pixmap() into another QPainter will get things doubled.
src/plasma/svg.h
<https://git.reviewboard.kde.org/r/122673/#comment52957>
docs
src/plasma/svg.cpp
<https://git.reviewboard.kde.org/r/122673/#comment52959>
Returning pixmaps with a doubled size with no devicePixelRatio set is going to \
screw up the client in a QPainter based app.
We want some sort
same for ::image()
for the paint() it doesn't matter as we're doing the painting ourselves and ready \
explicitly say our sourceRect is larger than the targetRect which is accompilishing \
the same thing
src/plasma/svg.cpp
<https://git.reviewboard.kde.org/r/122673/#comment52960>
natural size pixmaps aren't being scaled by the devicePixelRatio.
(we could ignore it, as SvgItem always uses the image() version with an explicit \
size)
- David Edmundson
On March 4, 2015, 2 p.m., Marco Martin wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/122673/
> -----------------------------------------------------------
>
> (Updated March 4, 2015, 2 p.m.)
>
>
> Review request for Plasma.
>
>
> Repository: plasma-framework
>
>
> Description
> -------
>
> (still in progress but here for feedback)
> when QT_DEVICE_PIXELRATIO is something different from 1, the pixmaps generated by \
> Svg will be scaled up to give a proper texture.
> This is complementary but not replacing our current approach:
> the pixelratio that can be accessed by units is now in relation to the qt pixel \
> ratio, spacings are also adjusted accordingly (therefore, spaces and sizes won't \
> need an integer value like pixelratio)
> svg introduces also a scaleFactor property (that is pretty much like its old \
> pixelRatio) basically, scalefactor, will scale both the textures *and* all the \
> reported sizes, (old method) pixelratio just scales textures without altering \
> measures (like qt pixelratio likes) they are now both used and combined, so a) we \
> can have this working before supporting officially qt pixelratio when will be good \
> enough but b) keeping the old mwthod working for the time being c) by using both at \
> the sae time we can at least scale sizes of values != from integers, for screens \
> that are too dense for 1 and not enough for 2
>
> Diffs
> -----
>
> src/declarativeimports/core/units.cpp a740145
> src/plasma/framesvg.cpp 1bb3510
> src/plasma/private/svg_p.h a31d0ac
> src/plasma/svg.h 0bcbd7a
> src/plasma/svg.cpp 0a0db5e
> src/declarativeimports/core/framesvgitem.cpp dae8a4f
> src/declarativeimports/core/iconitem.cpp 03f40c4
> src/declarativeimports/core/svgitem.cpp 570c1c3
> src/declarativeimports/core/units.h 6c038ba
>
> Diff: https://git.reviewboard.kde.org/r/122673/diff/
>
>
> Testing
> -------
>
>
> Thanks,
>
> Marco Martin
>
>
--===============5178218386714640274==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/122673/">https://git.reviewboard.kde.org/r/122673/</a>
</td>
</tr>
</table>
<br />
<div>
<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="https://git.reviewboard.kde.org/r/122673/diff/2/?file=352924#file352924line807" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/plasma/framesvg.cpp</a> <span style="font-weight: normal;">
(Diff revision 2)
</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; ">void \
FrameSvgPrivate::generateFrameBackground(FrameData *frame)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">807</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">frame</span><span class="o">-></span><span \
class="n">cachedBackground</span> <span class="o">=</span> <span \
class="n">QPixmap</span><span class="p">(</span><span class="n">size</span><span \
class="p">);</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">807</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="n">frame</span><span \
class="o">-></span><span class="n">cachedBackground</span> <span \
class="o">=</span> <span class="n">QPixmap</span><span class="p">(</span><span \
class="n">size</span><span class="p">);</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">we \
need to setDevicePixelRatio on this, otherwise any app that tries to paint a \
FrameSvg::Pixmap() into another QPainter will get things doubled.</p></pre> </div>
</div>
<br />
<div>
<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="https://git.reviewboard.kde.org/r/122673/diff/2/?file=352926#file352926line98" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/plasma/svg.h</a> <span style="font-weight: normal;">
(Diff revision 2)
</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; \
">public:</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">98</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">qreal</span> <span class="n">scaleFactor</span><span class="p">()</span> \
<span class="k">const</span><span class="p">;</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">docs</p></pre> </div>
</div>
<br />
<div>
<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="https://git.reviewboard.kde.org/r/122673/diff/2/?file=352927#file352927line762" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/plasma/svg.cpp</a> <span style="font-weight: normal;">
(Diff revision 2)
</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; \
">Plasma::Theme::ColorGroup Svg::colorGroup() const</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">739</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">return</span> <span class="n">d</span><span class="o">-></span><span \
class="n">findInCache</span><span class="p">(</span><span \
class="n">elementID</span><span class="p">,</span> <span class="n">size</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">761</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="k">return</span> <span \
class="n">d</span><span class="o">-></span><span class="n">findInCache</span><span \
class="p">(</span><span class="n">elementID</span><span class="p">,</span> <span \
class="n">size</span><span class="p">()</span><span class="hl"> </span><span \
class="o"><span class="hl">*</span></span><span class="hl"> </span><span \
class="n"><span class="hl">d</span></span><span class="o"><span \
class="hl">-></span></span><span class="n"><span \
class="hl">devicePixelRatio</span></span><span class="p">);</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Returning pixmaps with a doubled size with no devicePixelRatio set is going \
to screw up the client in a QPainter based app.</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">We \
want some sort same for ::image()</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">for the paint() it doesn't matter as we're doing the \
painting ourselves and ready explicitly say our sourceRect is larger than the \
targetRect which is accompilishing the same thing</p></pre> </div>
</div>
<br />
<div>
<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="https://git.reviewboard.kde.org/r/122673/diff/2/?file=352927#file352927line764" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/plasma/svg.cpp</a> <span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">QImage \
Svg::image(const QSize &size, const QString &elementID)</pre></td> <td \
colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">741</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">return</span> <span class="n">d</span><span class="o">-></span><span \
class="n">findInCache</span><span class="p">(</span><span \
class="n">elementID</span><span class="p">);</span></pre></td> <th bgcolor="#f0f0f0" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">763</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">return</span> <span class="n">d</span><span class="o">-></span><span \
class="n">findInCache</span><span class="p">(</span><span \
class="n">elementID</span><span class="p">);</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">natural size pixmaps aren't being scaled by the devicePixelRatio.</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">(we could ignore it, as SvgItem always uses the image() version with an \
explicit size)</p></pre> </div>
</div>
<br />
<p>- David Edmundson</p>
<br />
<p>On March 4th, 2015, 2 p.m. UTC, Marco Martin wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Plasma.</div>
<div>By Marco Martin.</div>
<p style="color: grey;"><i>Updated March 4, 2015, 2 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-framework
</div>
<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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">(still in progress but here for feedback) when \
QT_DEVICE_PIXELRATIO is something different from 1, the pixmaps generated by Svg will \
be scaled up to give a proper texture.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">This is complementary \
but not replacing our current approach: the pixelratio that can be accessed by units \
is now in relation to the qt pixel ratio, spacings are also adjusted accordingly \
(therefore, spaces and sizes won't need an integer value like pixelratio)</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">svg introduces also a scaleFactor property (that is pretty much like its \
old pixelRatio) basically, scalefactor, will scale both the textures <em \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
normal;">and</em> all the reported sizes, (old method) pixelratio just scales \
textures without altering measures (like qt pixelratio likes) they are now both used \
and combined, so a) we can have this working before supporting officially qt \
pixelratio when will be good enough but b) keeping the old mwthod working for the \
time being c) by using both at the sae time we can at least scale sizes of values != \
from integers, for screens that are too dense for 1 and not enough for 2</p></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>src/declarativeimports/core/units.cpp <span style="color: \
grey">(a740145)</span></li>
<li>src/plasma/framesvg.cpp <span style="color: grey">(1bb3510)</span></li>
<li>src/plasma/private/svg_p.h <span style="color: grey">(a31d0ac)</span></li>
<li>src/plasma/svg.h <span style="color: grey">(0bcbd7a)</span></li>
<li>src/plasma/svg.cpp <span style="color: grey">(0a0db5e)</span></li>
<li>src/declarativeimports/core/framesvgitem.cpp <span style="color: \
grey">(dae8a4f)</span></li>
<li>src/declarativeimports/core/iconitem.cpp <span style="color: \
grey">(03f40c4)</span></li>
<li>src/declarativeimports/core/svgitem.cpp <span style="color: \
grey">(570c1c3)</span></li>
<li>src/declarativeimports/core/units.h <span style="color: \
grey">(6c038ba)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/122673/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============5178218386714640274==--
[Attachment #3 (text/plain)]
_______________________________________________
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