[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Knights] cfe5b83: Correctly resize and center the scene to the view.
From:       Miha "ÄanÄula" <miha.cancula () gmail ! com>
Date:       2010-11-30 20:50:58
Message-ID: 20101130205058.0674FA60B1 () git ! kde ! org
[Download RAW message or body]

commit cfe5b83b3da5d91b1b75c01c9ef88170c5a26004
branch master
Author: Miha Čančula <miha.cancula@gmail.com>
Date:   Tue Nov 30 21:49:57 2010 +0100

    Correctly resize and center the scene to the view.

diff --git a/src/board.cpp b/src/board.cpp
index ae97570..054724d 100644
--- a/src/board.cpp
+++ b/src/board.cpp
@@ -581,8 +581,8 @@ void Board::updateGraphics()
     }
     else
     {
-        sideMargin = 0.5 * tileSize.width();
-        topMargin = 0.5 * tileSize.height();
+        sideMargin = 0.0;
+        topMargin = 0.0;
     }
     boardSize = boardSize + 2 * QSizeF ( sideMargin, topMargin );
     qreal ratio = qMin ( sceneRect().width() / boardSize.width(), \
sceneRect().height() / boardSize.height() ); @@ -599,7 +599,8 @@ void \
Board::updateGraphics()  
     sideMargin = qMax ( sideMargin, ( sceneRect().width() - 8 * m_tileSize ) / 2 );
     topMargin = qMax ( topMargin, ( sceneRect().height() - 8 * m_tileSize ) / 2 );
-    m_boardRect = QRectF ( sideMargin, topMargin, m_tileSize * 8, m_tileSize * 8 );
+    m_boardRect = QRectF( sceneRect().topLeft() + QPointF( sideMargin, topMargin ),
+                          QSizeF( m_tileSize, m_tileSize ) * 8);
     QSize tSize = QSizeF ( m_tileSize, m_tileSize ).toSize();
 
     QPointF bottomBorderPoint = m_boardRect.bottomLeft() - QPointF ( vBorderMargin, \
                0.0 );
diff --git a/src/knightsview.cpp b/src/knightsview.cpp
index da0e26a..d19ee7d 100644
--- a/src/knightsview.cpp
+++ b/src/knightsview.cpp
@@ -126,7 +126,7 @@ void KnightsView::resizeScene()
 {
     if ( ui.canvas && m_board )
     {
-        m_board->setSceneRect ( ui.canvas->rect() );
+        m_board->setSceneRect ( ui.canvas->contentsRect() );
         m_board->updateGraphics();
         ui.canvas->setTransform ( QTransform() );
     }


[prev in list] [next in list] [prev in thread] [next in thread]