<table><tr><td style="">davidedmundson accepted this revision.<br />davidedmundson added a comment.<br />This revision is now accepted and ready to land.
</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/D6028" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>looks good. (well except for how horrible that borrowed Qt class is)</p>
<p>We need to fix the OS X code path. (even if we just comment out the current stuff)</p></div></div><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/D6028#inline-24764" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kquickstyleitem.cpp:188</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: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">style</span><span class="p">()</span> <span style="color: #aa2211">==</span> <span class="n">QLatin1String</span><span class="p">(</span><span style="color: #766510">"mac"</span><span class="p">))</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">platformFont</span> <span style="color: #aa2211">==</span> <span class="n">QPlatformTheme</span><span style="color: #aa2211">::</span><span class="n">PushButtonFont</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">menu</span><span style="color: #aa2211">-></span><span class="n">setProperty</span><span class="p">(</span><span style="color: #766510">"__xOffset"</span><span class="p">,</span> <span style="color: #601200">12</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This won't compile; there's not such member var.</p>
<p style="padding: 0; margin: 8px;">(I know this is the bit of code I ported...sorry!)</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/D6028#inline-24766" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kquickstyleitem.cpp:401-402</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: rgba(151, 234, 151, .6);"> <span class="n">opt</span><span style="color: #aa2211">-></span><span class="n">font</span> <span style="color: #aa2211">=</span> <span class="n">font</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">opt</span><span style="color: #aa2211">-></span><span class="n">fontMetrics</span> <span style="color: #aa2211">=</span> <span class="n">QFontMetrics</span><span class="p">(</span><span class="n">font</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_font</span> <span style="color: #aa2211">=</span> <span class="n">opt</span><span style="color: #aa2211">-></span><span class="n">font</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I know this is inherited code, but I'm in review mode.</p>
<p style="padding: 0; margin: 8px;">This m_font stuff is (and was) truly broken.</p>
<p style="padding: 0; margin: 8px;">The code in updateHints is:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">initStyleOption();
updateSizeHint();
if (m_styleoption->state & QStyle::State_Mini) {
m_font.setPointSize(9.);</pre></div>
<p style="padding: 0; margin: 8px;">Which means we're changing the font *after* we've set it to the font metrics of the QStyleItem.</p>
<p style="padding: 0; margin: 8px;">I'm thinking we could can move it all to be at the top of this method.</p>
<p style="padding: 0; margin: 8px;">m_font = qApp->font(classNameForType());<br />
if (mini) {m_font.setSize(...)</p>
<p style="padding: 0; margin: 8px;">Lets make that a job for later though.</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/D6028#inline-24768" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kquickstyleitem_p.h:4</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: rgba(151, 234, 151, .6);"><span style="color: #74777d">** Copyright (C) 2016 The Qt Company Ltd.</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d">** Contact: https://www.qt.io/licensing/</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d">**</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">We should add us here and in the cpp</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/D6028#inline-24767" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kquickstyleitem_p.h:271</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: rgba(151, 234, 151, .6);"><span style="color: #a0a000">protected</span><span class="p">:</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QWidget</span> <span style="color: #aa2211">*</span><span class="n">m_dummywidget</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QStyleOption</span> <span style="color: #aa2211">*</span><span class="n">m_styleoption</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">unused?</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R858 Qt Quick Controls 2: Desktop Style</div></div></div><br /><div><strong>BRANCH</strong><div><div>mart/qquickstyleitemfork</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D6028" rel="noreferrer">https://phabricator.kde.org/D6028</a></div></div><br /><div><strong>To: </strong>mart, Plasma, davidedmundson<br /><strong>Cc: </strong>plasma-devel, ZrenBot, spstarr, progwolff, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart, lukas<br /></div>