Hello!
Here is a patch preventing motion of the page margins marks out of a page.
Bye, Alexey.
diff -urNwb -x CVS -x WIN32_20.1_i386_DBG -x WIN32_20.1_i386_OBJ -x abidiff.cmd -x
patch.txt -x .#*.* abi.org\src\/wp/ap/xp/ap_TopRuler.cpp
abi.ruler\src\/wp/ap/xp/ap_TopRuler.cpp
--- abi.org\src\/wp/ap/xp/ap_TopRuler.cpp Thu May 18 18:43:54 2000
+++ abi.ruler\src\/wp/ap/xp/ap_TopRuler.cpp Thu May 18 20:52:03 2000
@@ -1546,6 +1546,11 @@
{
m_draggingCenter = iRightIndentPos - m_minColumnWidth;
}
+ iIndentShift =
+UT_MIN(0,UT_MIN(m_infoCache.m_xrLeftIndent,m_infoCache.m_xrLeftIndent +
+m_infoCache.m_xrFirstLineIndent));
+ if (m_draggingCenter - xAbsLeft + iIndentShift < 0)
+ {
+ m_draggingCenter = xAbsLeft - iIndentShift;
+ }
if(m_draggingCenter == oldDragCenter)
{
@@ -1610,6 +1615,12 @@
m_draggingCenter = iLeftIndentPos + m_minColumnWidth;
}
+ UT_sint32 iIndentShift = UT_MIN(0,m_infoCache.m_xrRightIndent);
+ if (xAbsRight - m_draggingCenter + iIndentShift < 0 )
+ {
+ m_draggingCenter = xAbsRight + iIndentShift;
+ }
+
if(m_draggingCenter == oldDragCenter)
{
// Position not changing so finish here.