<table><tr><td style="">davidedmundson added inline comments.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D3892" rel="noreferrer">View Revision</a></tr></table><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D3892#inline-15486" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">iconitem.cpp:325</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">const</span> <span class="n">QSize</span> <span style="color: #aa2211">&</span><span class="n">paintedSize</span> <span style="color: #aa2211">=</span> <span class="n">m_iconPixmap</span><span class="p">.</span><span class="n">size</span><span class="p">().</span><span class="n">scaled</span><span class="p">(</span><span class="n">actualContainerSize</span><span class="p">,</span> <span class="n">Qt</span><span style="color: #aa2211">::</span><span class="n">KeepAspectRatio</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">return</span> <span style="color: #004012">QSize</span><span class="p">(</span><span class="n">Units</span><span style="color: #aa2211">::</span><span class="n">roundToIconSize</span><span class="p">(</span><span class="n">paintedSize</span><span class="p">.</span><span class="n">width</span><span class="p">()),</span> <span class="n">Units</span><span style="color: #aa2211">::</span><span class="n">roundToIconSize</span><span class="p">(</span><span class="n">paintedSize</span><span class="p">.</span><span class="n">height</span><span class="p">()));</span>
</div><div style="padding: 0 8px; margin: 0 4px; "><span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This makes no sense.<br />
You can't round it to icon sizes *after* scaling, it means the shorter size is always just wrong.</p>
<p style="padding: 0; margin: 8px;">If we do merge this patch, you want:</p>
<p style="padding: 0; margin: 8px;">m_iconPixmap.size().scaled(QSize(Units.roundtoIconSize(actualContainerSize.width), Units.roundToIconSize(actualContainerSize.height)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D3892#inline-15487" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">iconitem.cpp:377</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">m_sizeChanged</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #ffd0d0;"> <span style="color: #aa4000">const</span> <span class="bright"></span><span style="color: #aa4000"><span class="bright">int</span></span><span class="bright"> </span><span class="n"><span class="bright">iconSize</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="n"><span class="bright">Units</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">roundToIconSize</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">qMin</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">boundingRect</span></span><span class="bright"></span><span class="p"><span class="bright">().</span></span><span class="bright"></span><span class="n"><span class="bright">size</span></span><span class="bright"></span><span class="p"><span class="bright">().</span></span><span class="bright"></span><span class="n"><span class="bright">width</span></span><span class="bright"></span><span class="p"><span class="bright">(),</span></span><span class="bright"> </span><span class="n"><span class="bright">boundingRect</span></span><span class="bright"></span><span class="p"><span class="bright">().</span></span><span class="bright"></span><span class="n"><span class="bright">size</span></span><span class="bright"></span><span class="p"><span class="bright">().</span></span><span class="bright"></span><span class="n"><span class="bright">height</span></span><span class="bright"></span><span class="p"><span class="bright">())</span>);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #ffd0d0;"> <span style="color: #aa4000">const</span> <span class="n">QRect</span> <span style="color: #004012">destRect</span><span class="p">(</span><span class="n">QPointF</span><span class="p">(</span><span class="n">boundingRect</span><span class="p">().</span><span class="n">center</span><span class="p">()</span> <span style="color: #aa2211">-</span> <span class="n">QPointF</span><span class="p">(<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">icon</span>Size<span class="bright"></span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">/</span></span><span class="bright"></span><span style="color: #601200"><span class="bright">2</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n"><span class="bright">icon</span>Size<span class="bright"></span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">/</span></span><span class="bright"></span><span style="color: #601200"><span class="bright">2</span></span><span class="bright"></span><span class="p"><span class="bright">))</span>.</span><span class="n">toPoint</span><span class="p">(),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #ffd0d0;"> <span class="n">QSize</span><span class="p">(</span><span class="n">iconSize</span><span class="p">,</span> <span class="n">iconSize</span><span class="p">));</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #ffd0d0;">
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">const</span> <span class="bright"></span><span class="n"><span class="bright">QSize</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">&</span></span><span class="bright"></span><span class="n"><span class="bright">newSize</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="n"><span class="bright">paintedSize</span></span><span class="bright"></span><span class="p"><span class="bright">(</span>);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">const</span> <span class="n">QRect</span> <span style="color: #004012">destRect</span><span class="p">(</span><span class="n">QPointF</span><span class="p">(</span><span class="n">boundingRect</span><span class="p">().</span><span class="n">center</span><span class="p">()</span> <span style="color: #aa2211">-</span> <span class="n">QPointF</span><span class="p">(<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">new</span>Size<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">width</span></span><span class="bright"></span><span class="p"><span class="bright">(),</span></span><span class="bright"> </span><span class="n"><span class="bright">new</span>Size<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">height</span></span><span class="bright"></span><span class="p"><span class="bright">())</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">/</span></span><span class="bright"> </span><span style="color: #601200"><span class="bright">2</span></span><span class="bright"></span><span class="p"><span class="bright">)</span>.</span><span class="n">toPoint</span><span class="p">(),<span class="bright"></span></span><span class="bright"> </span><span class="n"><span class="bright">newSize</span></span><span class="bright"></span><span class="p"><span class="bright">);</span></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">You're using references a lot in a few patches that don't make any sense.</p>
<p style="padding: 0; margin: 8px;">paintedSize returns a new QSize object; you're keeping a reference to a value that would just be immediately discarded. This doesn't result in an optimisation but instead doing something that would crash if it wasn't for a magic C++ feature where it lengthens the lifespan of the object.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R242 Plasma Frameworks</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D3892" rel="noreferrer">https://phabricator.kde.org/D3892</a></div></div><br /><div><strong>EMAIL PREFERENCES</strong><div><a href="https://phabricator.kde.org/settings/panel/emailpreferences/" rel="noreferrer">https://phabricator.kde.org/settings/panel/emailpreferences/</a></div></div><br /><div><strong>To: </strong>broulik, Plasma, hein<br /><strong>Cc: </strong>davidedmundson, plasma-devel, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas<br /></div>