commit b9ddd4e9f184f4a4545eca69c55ec1ad1ce59170
author chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 14:14:50 2012 +0000
committer chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 14:14:50 2012 +0000
tree e50cf0444338b1afeb0834faa7acfb92328eed35
parent b4ed0178d0f86da920b101a661cbe8fd4fda3ab3

Bug Fix: Current command mask now dynamically changes based on bounds of window.

Review URL: https://codereview.appspot.com/6384044

git-svn-id: http://skia.googlecode.com/svn/trunk@4504 2bbb7eff-a529-9590-31e7-b0007b416f81

debugger/QT/SkCanvasWidget.cpp

diff --git a/debugger/QT/SkCanvasWidget.cpp b/debugger/QT/SkCanvasWidget.cpp
index fe8db94..6b5faa4 100644
--- a/debugger/QT/SkCanvasWidget.cpp
+++ b/debugger/QT/SkCanvasWidget.cpp
@@ -55,7 +55,12 @@
 
     fDevice = new SkDevice(fBitmap);
     fCanvas = new SkCanvas(fDevice);
+<<<<<<< HEAD
+    fDebugCanvas->setBounds(event->size().width(), event->size().height());
+    fDebugCanvas->drawTo(fCanvas, fIndex);
+=======
     drawTo(fIndex);
+>>>>>>> refs/remotes/git-svn
     this->update();
 }
 
@@ -82,6 +87,7 @@
 
     delete fDebugCanvas;
     fDebugCanvas = new SkDebugCanvas();
+    fDebugCanvas->setBounds(this->width(), this->height());
 
     picture->draw(fDebugCanvas);
     fDebugCanvas->draw(fCanvas);