1) now that setCurrentRotation sets QWS_DISPLAY, dont call setDefaultRotation

2) now that we arent calling setDefaultRotation, we can rely on
   defaultRotation() returning the actual original default rotation (deforient).
   So in turn, we can simply 'flip back' to the original rotation, rather than
   trying to calculate what the original rotation would have been.

1 files changed, 10 insertions, 14 deletions

diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 3a5a3c9..42406da 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -30,27 +30,26 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 
 #include "rotate.h"
 
 
 RotateApplet::RotateApplet ( )
-        : QObject ( 0, "RotateApplet" ), ref ( 0 )
+        : QObject ( 0, "RotateApplet" ), ref ( 0 ), m_flipped( false )
 {
-    m_flipped = false;
 }
 
 RotateApplet::~RotateApplet ( )
 {
 }
 
 int RotateApplet::position ( ) const
 {
     return 2;
 }
 
 QString RotateApplet::name ( ) const
@@ -81,54 +80,51 @@ QIconSet RotateApplet::icon ( ) const
         if ( !img. isNull ( ))
                 pix. convertFromImage ( img. smoothScale ( 14, 14 ));
         return pix;
 }
 
 QPopupMenu *RotateApplet::popup ( QWidget * ) const
 {
         return 0;
 }
 
 void RotateApplet::activated ( )
 {
-    int currentRotation = QPEApplication::defaultRotation();
+    int defaultRotation = QPEApplication::defaultRotation();
 
     int newRotation;
 
     Config cfg( "qpe" );
     cfg.setGroup( "Appearance" );
 
     // 0 -> 90° clockwise, 1 -> 90° counterclockwise
-    bool rotDirection = cfg.readBoolEntry( "rotatedir" );
+    bool rotDirection = cfg.readBoolEntry( "rotatedir", 0 );
 
     // hide inputs methods before rotation
     QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
 
     if ( m_flipped )  {
-        if ( rotDirection  )  {
-            newRotation = ( currentRotation + 270 ) % 360;
-        } else {
-            newRotation = ( currentRotation + 90 ) % 360;
-        }
+        // if flipped, flip back to the original state,
+        // regardless of rotation direction
+        newRotation = defaultRotation;
     } else {
         if ( rotDirection )  {
-            newRotation = ( currentRotation + 90 ) % 360;
+            newRotation = ( defaultRotation + 90 ) % 360;
         } else {
-            newRotation = ( currentRotation + 270 ) % 360;
-         }
+            newRotation = ( defaultRotation + 270 ) % 360;
+        }
     }
+
     QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
     env << newRotation;
-    QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" );
-    env2 << newRotation;
 
     m_flipped = !m_flipped;
 }
 
 
 QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
         *iface = 0;
         if ( uuid == IID_QUnknown )
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;