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

List:       kde-commits
Subject:    kdeextragear-1/gwenview
From:       Aurélien Gâteau <aurelien.gateau () mail ! dotcom ! fr>
Date:       2003-07-27 20:00:22
[Download RAW message or body]

CVS commit by gateau: 

- Use different cursors for zoom and autozoom.


  A            pics/cursor/autozoom.png   1.1
  A            pics/cursor/zoom.xcf   1.1
  M +1 -1      pics/cursor/Makefile.am   1.2
  M +3 -1      pics/cursor/zoom.png   1.3
  M +12 -5     src/gvscrollpixmapview.cpp   1.28


--- kdeextragear-1/gwenview/pics/cursor/Makefile.am  #1.1:1.2
@@ -1,2 +1,2 @@
 cursordir=$(kde_datadir)/gwenview/cursor
-cursor_DATA=drag.png dragging.png browse.png zoom.png 
+cursor_DATA=drag.png dragging.png browse.png zoom.png autozoom.png 

--- kdeextragear-1/gwenview/src/gvscrollpixmapview.cpp  #1.27:1.28
@@ -137,5 +137,4 @@ public:
                         mView->startAutoHideTimer();
                 }
-                return;
         }
 
@@ -155,12 +154,15 @@ public:
 
 class GVScrollPixmapView::ZoomToolController : public GVScrollPixmapView::ToolController {
-        QCursor mCursor;
+        QCursor mZoomCursor;
+        QCursor mAutoZoomCursor;
 public:
         ZoomToolController(GVScrollPixmapView* view) : ToolController(view) {
-                mCursor=loadCursor("zoom");
+                mZoomCursor=loadCursor("zoom");
+                mAutoZoomCursor=loadCursor("autozoom");
         }
 
         void mouseReleaseEvent(QMouseEvent*) {
                 mView->autoZoom()->activate();
+                updateCursor();
         }
 
@@ -175,5 +177,11 @@ public:
 
         void updateCursor() {
-                mView->viewport()->setCursor(mCursor);
+                // This is inverted, since we show the cursor for the tool which will
+                // be activated *after* the click
+                if (mView->autoZoom()->isChecked()) {
+                        mView->viewport()->setCursor(mZoomCursor);
+                } else {
+                        mView->viewport()->setCursor(mAutoZoomCursor);
+                }
         }
 };
@@ -535,5 +543,4 @@ void GVScrollPixmapView::viewportMouseRe
                 }
                 mToolControllers[mTool]->mouseReleaseEvent(event);
-                mToolControllers[mTool]->updateCursor();
                 break;
                         


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