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, 9 insertions, 13 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
@@ -10,137 +10,133 @@
      ._= =}       :          or (at your option) any later version.
     .%+i>       _;_.
     .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #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
 {
 	return tr( "Rotate shortcut" );
 }
 
 QString RotateApplet::text ( ) const
 {
 	return tr( "Rotate" );
 }
 
 QString RotateApplet::tr( const char* s ) const
 {
     return qApp->translate( "RotateApplet", s, 0 );
 }
 
 QString RotateApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "RotateApplet", s, p );
 }
 
 QIconSet RotateApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "Rotation" );
 
 	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;
 
 	if ( *iface )
 		(*iface)-> addRef ( );
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
 	Q_CREATE_INSTANCE( RotateApplet )
 }