r15801 by jghali - #9475 : guides from master pages disappear from page

[scribus-commit]

Author: jghali
Date: Sun Nov  7 12:14:52 2010
New Revision: 15801

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15801
Log:
#9475 : guides from master pages disappear from page

Modified:
    trunk/Scribus/scribus/canvasgesture_rulermove.cpp

Modified: trunk/Scribus/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15801&path=/trunk/Scribus/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.cpp Sun Nov  7 12:14:52 2010
@@ -28,6 +28,8 @@
 void RulerGesture::drawControls(QPainter* p)
 {
 	Page* page = m_doc->currentPage();
+	if (m_haveGuide)
+		page = m_doc->Pages->at(m_page);
 	QColor color(m_doc->guidesPrefs().guideColor);
 	p->save();
 	QPoint pageOrigin = m_canvas->canvasToLocal(QPointF(page->xOffset(), page->yOffset()));
@@ -194,6 +196,8 @@
 						m_doc->Pages->at(page)->guides.addHorizontal(mousePointDoc.y() - m_doc->Pages->at(page)->yOffset(), GuideManagerCore::Standard);
 						m_page = page;
 					}
+					if (m_doc->currentPage() != m_doc->Pages->at(m_page))
+						m_doc->setCurrentPage( m_doc->Pages->at(m_page) );
 					m_doc->changed();
 				}
 				else
@@ -248,6 +252,8 @@
 						m_doc->Pages->at(page)->guides.addVertical(mousePointDoc.x() - m_doc->Pages->at(page)->xOffset(), GuideManagerCore::Standard);
 						m_page = page;
 					}
+					if (m_doc->currentPage() != m_doc->Pages->at(m_page))
+						m_doc->setCurrentPage( m_doc->Pages->at(m_page) );
 					m_doc->changed();
 				}
 				else