<table><tr><td style="">aacid 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/D16941">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/D16941#inline-94045">View Inline</a><span style="color: #4b4d51; font-weight: bold;">pageview.cpp:1334</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: #74777d">// restore viewport center or use default {x-center,v-top} alignment</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">const</span></span><span class="bright"> </span><span class="n"><span class="bright">QRect</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">r</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">item</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">croppedGeometry</span></span><span class="bright"></span><span class="p"><span class="bright">(</span>);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">int</span> <span class="n">newCenterX</span> <span style="color: #aa2211">=</span> <span class="n">r</span><span class="p">.</span><span class="n">left</span><span class="p">(),</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">newCenterY</span> <span style="color: #aa2211">=</span> <span class="n">r</span><span class="p">.</span><span class="n">top</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">vp</span><span class="p">.</span><span class="n">rePos</span><span class="p">.</span><span class="n">enabled</span> <span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">vp</span><span class="p">.</span><span class="n">rePos</span><span class="p">.</span><span class="n">pos</span> <span style="color: #aa2211">==</span> <span class="n">Okular</span><span style="color: #aa2211">::</span><span class="n">DocumentViewport</span><span style="color: #aa2211">::</span><span class="n">Center</span> <span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">newCenterX</span> <span style="color: #aa2211">+=</span> <span class="p">(</span><span style="color: #aa4000">int</span><span class="p">)(</span> <span class="n">normClamp</span><span class="p">(</span> <span class="n">vp</span><span class="p">.</span><span class="n">rePos</span><span class="p">.</span><span class="n">normalizedX</span><span class="p">,</span> <span style="color: #601200">0.5</span> <span class="p">)</span> <span style="color: #aa2211">*</span> <span class="p">(</span><span style="color: #aa4000">double</span><span class="p">)</span><span class="n">r</span><span class="p">.</span><span class="n">width</span><span class="p">()</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">newCenterY</span> <span style="color: #aa2211">+=</span> <span class="p">(</span><span style="color: #aa4000">int</span><span class="p">)(</span> <span class="n">normClamp</span><span class="p">(</span> <span class="n">vp</span><span class="p">.</span><span class="n">rePos</span><span class="p">.</span><span class="n">normalizedY</span><span class="p">,</span> <span style="color: #601200">0.0</span> <span class="p">)</span> <span style="color: #aa2211">*</span> <span class="p">(</span><span style="color: #aa4000">double</span><span class="p">)</span><span class="n">r</span><span class="p">.</span><span class="n">height</span><span class="p">()</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">else</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #74777d">// TopLeft</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">newCenterX</span> <span style="color: #aa2211">+=</span> <span class="p">(</span><span style="color: #aa4000">int</span><span class="p">)(</span> <span class="n">normClamp</span><span class="p">(</span> <span class="n">vp</span><span class="p">.</span><span class="n">rePos</span><span class="p">.</span><span class="n">normalizedX</span><span class="p">,</span> <span style="color: #601200">0.0</span> <span class="p">)</span> <span style="color: #aa2211">*</span> <span class="p">(</span><span style="color: #aa4000">double</span><span class="p">)</span><span class="n">r</span><span class="p">.</span><span class="n">width</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span class="n">viewport</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">width</span><span class="p">()</span> <span style="color: #aa2211">/</span> <span style="color: #601200">2</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">newCenterY</span> <span style="color: #aa2211">+=</span> <span class="p">(</span><span style="color: #aa4000">int</span><span class="p">)(</span> <span class="n">normClamp</span><span class="p">(</span> <span class="n">vp</span><span class="p">.</span><span class="n">rePos</span><span class="p">.</span><span class="n">normalizedY</span><span class="p">,</span> <span style="color: #601200">0.0</span> <span class="p">)</span> <span style="color: #aa2211">*</span> <span class="p">(</span><span style="color: #aa4000">double</span><span class="p">)</span><span class="n">r</span><span class="p">.</span><span class="n">height</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span class="n">viewport</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">height</span><span class="p">()</span> <span style="color: #aa2211">/</span> <span style="color: #601200">2</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">else</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">newCenterX</span> <span style="color: #aa2211">+=</span> <span class="n">r</span><span class="p">.</span><span class="n">width</span><span class="p">()</span> <span style="color: #aa2211">/</span> <span style="color: #601200">2</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">newCenterY</span> <span style="color: #aa2211">+=</span> <span class="n">viewport</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">height</span><span class="p">()</span> <span style="color: #aa2211">/</span> <span style="color: #601200">2</span> <span style="color: #aa2211">-</span> <span style="color: #601200">10</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span class="n"><span class="bright">QPoint</span></span><span class="bright"> </span><span class="n"><span class="bright">centerCoord</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">viewportToContentArea</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"> </span><span class="n"><span class="bright">vp</span></span><span class="bright"> </span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const</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/D16941#inline-94046">View Inline</a><span style="color: #4b4d51; font-weight: bold;">pageview.cpp:4656</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(251, 175, 175, .7);"><span class="bright"> </span><span style="color: #aa4000"><span class="bright">const</span></span><span class="bright"> </span><span class="n"><span class="bright">QRect</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">geometry</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">d</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">items</span></span><span class="bright"></span><span class="p"><span class="bright">[</span></span><span class="bright"> </span><span class="n"><span class="bright">vp</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">pageNumber</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 class="n"><span class="bright">croppedGeometry</span></span><span class="bright"></span><span class="p"><span class="bright">();</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">double</span></span><span class="bright"> </span><span class="n"><span class="bright">nX</span></span> <span style="color: #aa2211">=</span> <span class="n">v<span class="bright">p</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">rePos</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">enabled</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">normClamp</span></span><span class="p">(</span> <span class="n">vp<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">rePos</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">normalizedX</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span style="color: #601200"><span class="bright">0.5</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">0.5</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"> </span><span class="n"><span class="bright">nY</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">vp</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">re</span>Pos</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">enabled</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">normClamp</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"> </span><span class="n"><span class="bright">vp</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">re</span>Pos</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">normalizedY</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span style="color: #601200"><span class="bright">0.0</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">0.0</span></span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span class="n"><span class="bright">QPoint</span></span><span class="bright"> </span><span class="n"><span class="bright">centerPos</span></span> <span style="color: #aa2211">=</span> <span class="n">v<span class="bright">iewportToContentArea</span></span><span class="p">(</span> <span class="n">vp<span class="bright"></span></span><span class="bright"> </span><span class="p"><span class="bright">);</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span class="n"><span class="bright">center</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"> </span><span class="n"><span class="bright">center</span>Pos</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">x</span></span><span class="bright"></span><span class="p"><span class="bright">(),</span></span><span class="bright"> </span><span class="n"><span class="bright">center</span>Pos</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">y</span></span><span class="bright"></span><span class="p"><span class="bright">()</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;">const</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R223 Okular</div></div></div><br /><div><strong>BRANCH</strong><div><div>unify_vp_calc</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D16941">https://phabricator.kde.org/D16941</a></div></div><br /><div><strong>To: </strong>tobiasdeiminger, Okular, sander<br /><strong>Cc: </strong>ngraham, sander, aacid, okular-devel, darcyshen<br /></div>