<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/128201/">https://git.reviewboard.kde.org/r/128201/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On June 19th, 2016, 7:19 p.m. UTC, <b>David Faure</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;">OK forget trying to match the objectname of a widget's style. I would still do the "runtime check" on sizeHint (as you do) in all cases, which almost removes the need for objectname comparisons.</pre>
</blockquote>
<p>On June 19th, 2016, 8:46 p.m. UTC, <b>René J.V. Bertin</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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Would you want me to initialise <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">maximumHeight</code> from <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">m_pProgressBar-></code><em style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">sizeHint</em><code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">().height()</code>, which would give a whopping big button like in https://git.reviewboard.kde.org/r/128201/file/3134/ ? </p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I could however initialise <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">maximumHeight</code> from <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">m_pProgressBar->minimumSizeHint().height</code> everywhere except when <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">macWidgetStyle</code> (in that case I'd use <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">sizeHint().height()</code>). That way, <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">maximumHeight</code> won't change compared to its current value; presumably because all other styles I tried (Breeze, Oxygen, QtCurve, Fusion, Windows) set the progressbar height to the font label height plus a bit of margin.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">However, this doesn't remove the need for the first <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">macWidgetStyle</code> check, and I also don't see how I could get rid of the 2nd check reliably. I could do</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"> <span style="color: #008000; font-weight: bold">if</span> <span style="color: #666666">(</span><span style="color: #008000; font-weight: bold">maximumHeight</span> <span style="color: #666666">></span> <span style="color: #008000; font-weight: bold">fontMetrics</span><span style="color: #0000FF; font-weight: bold">.height</span><span style="color: #666666">()</span> <span style="color: #666666">+</span> <span style="color: #008000; font-weight: bold">2</span><span style="color: #666666">)</span> {
m_pButton<span style="color: #666666">-></span>setMaximumWidth( m_pButton<span style="color: #666666">-></span>iconSize()<span style="color: #666666">.</span><span style="color: #008000; font-weight: bold">width</span>() <span style="color: #666666">+</span> <span style="color: #666666">4</span> );
} <span style="color: #008000; font-weight: bold">else</span> {
m_pButton<span style="color: #666666">-></span>setAttribute( Qt<span style="color: #666666">::</span>WA_LayoutUsesWidgetRect<span style="color: #666666">,</span> true );
stack<span style="color: #666666">-></span>setMaximumHeight( maximumHeight );
}
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">instead of the current</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"> <span style="color: #008000; font-weight: bold">if</span> <span style="color: #666666">(</span><span style="color: #008000; font-weight: bold">macWidgetStyle</span><span style="color: #666666">)</span> {
m_pButton<span style="color: #666666">-></span>setMaximumWidth( m_pButton<span style="color: #666666">-></span>iconSize()<span style="color: #666666">.</span><span style="color: #008000; font-weight: bold">width</span>() <span style="color: #666666">+</span> <span style="color: #666666">4</span> );
} <span style="color: #008000; font-weight: bold">else</span> {
m_pButton<span style="color: #666666">-></span>setAttribute( Qt<span style="color: #666666">::</span>WA_LayoutUsesWidgetRect<span style="color: #666666">,</span> true );
stack<span style="color: #666666">-></span>setMaximumHeight( maximumHeight );
}
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">but I don't find that more readable, the need for different treatment isn't a direct cause of the height difference, and as I said before, we cannot be certain that the height comparison is only true with the macintosh style. </p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Am I overlooking something?</p></pre>
</blockquote>
<p>On June 19th, 2016, 8:56 p.m. UTC, <b>David Faure</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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I thought simply something like
int maximumHeight = qMin(fontMetrics().height(), m_pProgressBar->sizeHint().height() - 8)
on all platforms, and applying that height to both button and label?</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">(the 8 is from the sizeHint code).</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Calling minimumSizeHint on a progressbar isn't really useful, it's the same as fontMetrics().height() + 2, which is what the old code did, no?</p></pre>
</blockquote>
<p>On June 19th, 2016, 10:30 p.m. UTC, <b>René J.V. Bertin</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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Yes, minimumSizeHint() returns the same as fontMetrics().height + 2, but you can also say that sizeHint().height == fontMetrics().height + 8. For the styles we've tested and except for OS X where sizeHint().height == fontMetrics().height + 4, apparently. So with all those other styles your qMin would be comparing 2 equal values. With the <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">macintosh</code> style I get <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">maximumHeight=m_pProgressBar->sizeHint().height()==20</code> regardless of font size (which is almost impossible to vary with the native style anyway) and this is in fact what <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">maximumHeight</code> should be set to even if it happens to be larger.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">You could do</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">int maximumHeight = m_pProgressBar->sizeHint().height() - (macWidgetStyle ? 0 : 6)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">That always returns 20 with the mac style, and something font-dependent with the other styles.
but then you still need the if(macWidgetStyle)/else block for the style specific icon sizing and button form.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I've reorganised the code more or less following these considerations. In the end it seems I can do without a 2nd macWidgetStyle test because the order of operations matters less than I thought.</p></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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I don't see what makes you say "sizeHint().height == fontMetrics().height + 8.".</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">The QProgressBar code says</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><span style="color: #008000; font-weight: bold">QSize</span> <span style="color: #008000; font-weight: bold">QProgressBar</span><span style="color: #666666">:</span><span style="color: #AA22FF">:sizeHint</span><span style="color: #666666">()</span> <span style="color: #008000; font-weight: bold">const</span>
{
ensurePolished();
QFontMetrics fm <span style="color: #666666">=</span> fontMetrics();
QStyleOptionProgressBar opt;
initStyleOption(<span style="color: #666666">&</span>opt);
int cw <span style="color: #666666">=</span> style()<span style="color: #666666">-></span>pixelMetric(QStyle<span style="color: #666666">::</span>PM_ProgressBarChunkWidth<span style="color: #666666">,</span> <span style="color: #666666">&</span>opt<span style="color: #666666">,</span> this);
QSize <span style="color: #008000; font-weight: bold">size</span> <span style="color: #666666">=</span> QSize(qMax(<span style="color: #666666">9,</span> cw) <span style="color: #666666">*</span> <span style="color: #666666">7</span> <span style="color: #666666">+</span> fm<span style="color: #666666">.</span><span style="color: #008000; font-weight: bold">width</span>(QLatin1Char(<span style="color: #BA2121">'0'</span>)) <span style="color: #666666">*</span> <span style="color: #666666">4,</span> fm<span style="color: #666666">.</span><span style="color: #008000; font-weight: bold">height</span>() <span style="color: #666666">+</span> <span style="color: #666666">8</span>);
if (opt<span style="color: #666666">.</span>orientation <span style="color: #666666">==</span> Qt<span style="color: #666666">::</span>Vertical)
<span style="color: #008000; font-weight: bold">size</span> <span style="color: #666666">=</span> <span style="color: #008000; font-weight: bold">size</span><span style="color: #666666">.</span>transposed();
return style()<span style="color: #666666">-></span>sizeFromContents(QStyle<span style="color: #666666">::</span>CT_ProgressBar<span style="color: #666666">,</span> <span style="color: #666666">&</span>opt<span style="color: #666666">,</span> <span style="color: #008000; font-weight: bold">size</span><span style="color: #666666">,</span> this);
}
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">and CT_ProgressBar returns a fixed value on Mac (1), independent from the input "size", I thought this was what this is all about.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">(1) qt_mac_aqua_get_metric(kThemeMetricNormalProgressBarThickness) + qt_mac_aqua_get_metric(kThemeMetricSmallProgressBarShadowOutset);</p></pre>
<br />
<p>- David</p>
<br />
<p>On June 19th, 2016, 1:12 p.m. UTC, René J.V. Bertin 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 KDevelop and David Faure.</div>
<div>By René J.V. Bertin.</div>
<p style="color: grey;"><i>Updated June 19, 2016, 1:12 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kdevplatform
</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;">I came across this old bit of code, judging from the use of the deprecated <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">Q_OS_MAC</code> token.
Some quick testing suggests that using <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">WA_LayoutUsesWidgetRect</code> achieves what I think is the intended effect without platform-specific code. (That platform test ought really check for using the <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">macintosh</code> widget style btw, rather than "are we running on OS X").</p></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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">For now only on OS X, with the native theme as well as QtCurve, Breeze and Oxygen.</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>shell/progresswidget/statusbarprogresswidget.cpp <span style="color: grey">(1a32ea8)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/128201/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments </h1>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/16/1498e8dc-4541-473b-b6db-2c2ae138cbc3__Screen_Shot_2016-06-17_at_00.17.17.png">OS X/Mac native *without* the patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/17/dd352994-1753-4b33-a0d2-cd2a3132df48__progress-stock.png">stock widget under Linux (same layout using Breeze)</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/18/8e6a0761-b760-4f41-be67-7f9ba7318349__Screen_Shot_2016-06-18_at_19.21.52.png">OS X/native with the new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/18/3535be4c-3034-493d-88c0-61ab9a13844d__Screen_Shot_2016-06-18_at_19.24.46.png">OS X using QtCurve with the new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/18/359d5f57-bdaa-45a7-a0b0-6acb5609459f__Screen_Shot_2016-06-18_at_19.16.19.png">Linux, Breeze, new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/18/f5eb0902-884a-47e5-bf84-a3581a21bece__Screen_Shot_2016-06-18_at_19.14.17.png">Linux, QtCurve, new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/18/536d4f09-8409-4eb4-80ca-27d3f744d6a0__Screen_Shot_2016-06-18_at_19.16.56.png">Linux, Oxygen, new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/19/ee2d687e-69ea-493f-9ae4-87d90be614e2__progress-patched-breeze.png">Linux, Breeze + Breeze icons, new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/19/7e3cfc5c-cb80-491c-b4d2-4d6f9c839a48__progress-patched-qtcurve.png">Linux, QtCurve + Breeze icons, new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/19/0b10d97d-3ba6-4d05-a663-3a03e29bc1c9__progress-patched-oxygen.png">Linux,Oxygen+Breeze icons, new patch</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/06/19/2a5b48bf-38f1-4ba9-a291-5de65537f8e1__progress-patched-breeze2.png">Linux, Breeze, new patch with maximumHeight from progressBar->sizeHint().height()</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>