<table><tr><td style="">mwolff requested changes to this revision.<br />mwolff added a comment.<br />This revision now requires changes to proceed.
</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/D8850" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>I guess we should split this patch up into three parts:</p>
<p>a) add unit test + the fix you found<br />
b) (if still required) enforce uniqueness in <tt style="background: #ebebeb; font-size: 13px;">Positoiner::updateMaps</tt> + unit test<br />
c) support drag and drop</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/D8850#inline-39630" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positionertest.cpp:219</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">auto</span> <span style="color: #aa2211">*</span><span class="n">screenMapper</span> <span style="color: #aa2211">=</span> <span class="n">ScreenMapper</span><span style="color: #aa2211">::</span><span class="n">instance</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">FolderModel</span> <span class="n">secondFolderModel</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">secondFolderModel</span><span class="p">.</span><span class="n">setUrl</span><span class="p">(</span><span class="n">m_folderDir</span><span style="color: #aa2211">-></span><span class="n">path</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span class="n">QDir</span><span style="color: #aa2211">::</span><span class="n">separator</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span class="n">desktop</span> <span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">second? this is the first and only one in this test, no?</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/D8850#inline-39631" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positionertest.cpp:229</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">QSignalSpy</span> <span style="color: #004012">s2</span><span class="p">(</span><span style="color: #aa2211">&</span><span class="n">secondFolderModel</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">FolderModel</span><span style="color: #aa2211">::</span><span class="n">listingCompleted</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">s2</span><span class="p">.</span><span class="n">wait</span><span class="p">(</span><span style="color: #601200">1000</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QSignalSpy</span> <span style="color: #004012">s</span><span class="p">(</span><span class="n">m_folderModel</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">FolderModel</span><span style="color: #aa2211">::</span><span class="n">listingCompleted</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;"><tt style="background: #ebebeb; font-size: 13px;">QVERIFY</tt> the wait, also below</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/D8850#inline-39629" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positionertest.cpp:232</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">QMap</span><span style="color: #aa2211"><</span><span style="color: #aa4000">int</span><span class="p">,</span> <span style="color: #aa4000">int</span><span style="color: #aa2211">></span> <span class="n">expectedSource2ProxyScreen0</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QMap</span><span style="color: #aa2211"><</span><span style="color: #aa4000">int</span><span class="p">,</span> <span style="color: #aa4000">int</span><span style="color: #aa2211">></span> <span class="n">expectedProxy2SourceScreen0</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">why not use hashes here too, then you can compare those below directly without having to convert the returned hash to a map first?</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/D8850#inline-39632" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positionertest.cpp:261</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">screenMapper</span><span style="color: #aa2211">-></span><span class="n">addMapping</span><span class="p">(</span><span class="n">movedItem</span><span class="p">,</span> <span style="color: #601200">1</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">s</span><span class="p">.</span><span class="n">wait</span><span class="p">(</span><span style="color: #601200">1000</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">s2</span><span class="p">.</span><span class="n">wait</span><span class="p">(</span><span style="color: #601200">1000</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">verify</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/D8850#inline-39633" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positionertest.cpp:282</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">screenMapper</span><span style="color: #aa2211">-></span><span class="n">addMapping</span><span class="p">(</span><span class="n">movedItem</span><span class="p">,</span> <span style="color: #601200">0</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">s</span><span class="p">.</span><span class="n">wait</span><span class="p">(</span><span style="color: #601200">1000</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">s2</span><span class="p">.</span><span class="n">wait</span><span class="p">(</span><span style="color: #601200">1000</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">verify</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/D8850#inline-39628" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positionertest.h:58</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: #a0a000">private</span><span class="p">:</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QMap</span><span style="color: #aa2211"><</span><span style="color: #aa4000">int</span><span class="p">,</span> <span style="color: #aa4000">int</span><span style="color: #aa2211">></span> <span class="n">hash2map</span><span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">QHash</span><span style="color: #aa2211"><</span><span style="color: #aa4000">int</span><span class="p">,</span> <span style="color: #aa4000">int</span><span style="color: #aa2211">></span> <span style="color: #aa2211">&</span><span class="n">hash</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">void</span> <span style="color: #004012">checkPositions</span><span class="p">(</span><span style="color: #aa4000">int</span> <span class="n">perStripe</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">could be a free function, no need to make this a member</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/D8850#inline-39634" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positioner.cpp:28</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">void</span> <span style="color: #004012">ensureUnique</span><span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">QHash</span><span style="color: #aa2211"><</span><span style="color: #aa4000">int</span><span class="p">,</span> <span style="color: #aa4000">int</span><span style="color: #aa2211">></span> <span class="n">mapping</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;">do we still need this? I don't think so - I added this only for debugging purposes. should probably be part of a unit test now</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/D8850#inline-39635" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positioner.cpp:461</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">QSet</span><span style="color: #aa2211"><</span><span class="n">QString</span><span style="color: #aa2211">></span> <span class="n">uniqueName</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">QSet</span><span style="color: #aa2211"><</span><span style="color: #aa4000">int</span><span style="color: #aa2211">></span> <span class="n">uniqueId</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">should also be removed and covered by a unit test instead I think</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/D8850#inline-39636" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">positioner.cpp:738</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 class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #74777d">// ensure we don't get duplicate mappings</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">const</span> <span style="color: #aa4000">auto</span> <span class="n">oldSourceIndex</span> <span style="color: #aa2211">=</span> <span class="n">m_proxyToSource</span><span class="p">.</span><span class="n">value</span><span class="p">(</span><span class="n">proxyIndex</span><span class="p">,</span> <span style="color: #aa2211">-</span><span style="color: #601200">1</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">this may be obsoleted by now, can you check whether it's still required?</p></div></div></div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D8850" rel="noreferrer">https://phabricator.kde.org/D8850</a></div></div><br /><div><strong>To: </strong>amantia, mwolff<br /><strong>Cc: </strong>broulik, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart<br /></div>