<table><tr><td style="">davidhurka edited reviewers, added: aacid; removed: davidhurka.<br />davidhurka added a comment.
</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/D21376">View Revision</a></tr></table><br /><div><div><p>You are not touching “Highlight with Comment”-style texts, which is probably good. (And would fit in another commit anyway.)<br />
There was a discussion about this in <a href="https://phabricator.kde.org/D10797" style="background-color: #e7e7e7;
border-color: #e7e7e7;
border-radius: 3px;
padding: 0 4px;
font-weight: bold;
color: black;text-decoration: line-through;">D10797</a>, and in <a href="https://phabricator.kde.org/T8533" style="background-color: #e7e7e7;
border-color: #e7e7e7;
border-radius: 3px;
padding: 0 4px;
font-weight: bold;
color: black;text-decoration: line-through;">T8533</a> in more general, but this patch is probably fine.<br />
(<a href="https://phabricator.kde.org/T8533" style="background-color: #e7e7e7;
border-color: #e7e7e7;
border-radius: 3px;
padding: 0 4px;
font-weight: bold;
color: black;text-decoration: line-through;">T8533</a> is why I thought the annotations would have been y-ordered.)</p>
<p>Your code:</p>
<ul class="remarkup-list">
<li class="remarkup-list-item">You use <tt style="background: #ebebeb; font-size: 13px;">auto</tt> some times. I think that’s only good if the type doesn’t matter or is too long to write it twice on the same line. NormalizedPoint and HighlightAnnotation::Quad will make it more readable.</li>
<li class="remarkup-list-item">You use braces for switch cases. Didn’t see that before. For consistency with the rest of Okular: remove them?</li>
<li class="remarkup-list-item">Bonus: If you create new functions or types, or modify functions you understand, could you write documentation for them?</li>
</ul>
<p>I’m also wondering whether the Annotation specific members of GuiUtils shouldn’t be members of Annotation.</p>
<p>Didn’t know HighlightAnnotation::Quad, will add that to my documentation todo list. Probably important for Bug 334297.</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/D21376#inline-120026">View Inline</a><span style="color: #4b4d51; font-weight: bold;">jangmarker</span> wrote in <span style="color: #4b4d51; font-weight: bold;">guiutils.cpp:77</span></div>
<div style="margin: 8px 0; padding: 0 12px; color: #74777D;"><p style="padding: 0; margin: 8px;">I'd be grateful for any ideas on how to make this more accurate. Sometimes it captures text of the previous or next line, sometimes it just misses some text.</p></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">If you use TextPage::textArea( textSelction ), you will get something like (using above source lines as example...):</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);">xtSelection(leftTop, rightDown);// TODO this does not seem</pre></div>
<p style="padding: 0; margin: 8px;">if only seem was highlighted, right?<br />
That’s because textArea() is this monster function which implements text selection for Text Selection mode.</p>
<p style="padding: 0; margin: 8px;">Did you try to make a RegularAreaRect from all NormalizedRect from leftTop and rightDown of each Quad, and pass that to text()?</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/D21376#inline-120174">View Inline</a><span style="color: #4b4d51; font-weight: bold;">guiutils.cpp:80</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="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">return</span> <span class="n">text</span><span class="p">.</span><span class="n">replace</span><span class="p">(</span><span style="color: #766510">'\n'</span><span class="p">,</span> <span style="color: #766510">""</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;">QString::simplified() is more predictable.</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/D21376#inline-120175">View Inline</a><span style="color: #4b4d51; font-weight: bold;">guiutils.cpp:83</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">return</span> <span class="n">QString</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;">Why <tt style="background: #ebebeb; font-size: 13px;">{}</tt>?</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/D21376#inline-120178">View Inline</a><span style="color: #4b4d51; font-weight: bold;">guiutils.cpp:198</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">QString</span> <span class="n">highlightedText</span> <span style="color: #aa2211">=</span> <span class="n">highlightedTextForAnnotation</span><span class="p">(</span><span class="n">ann</span><span class="p">,</span> <span class="n">page</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 style="color: #aa2211">!</span><span class="n">highlightedText</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">()</span> <span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Move 5 lines up, so code stays uniform.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R223 Okular</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D21376">https://phabricator.kde.org/D21376</a></div></div><br /><div><strong>To: </strong>jangmarker, Okular, aacid<br /><strong>Cc: </strong>davidhurka, okular-devel, joaonetto, tfella, ngraham, darcyshen, aacid<br /></div>