summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-27 05:26:47 (UTC)
committer kergoth <kergoth>2003-03-27 05:26:47 (UTC)
commita16e4becf2de9b5e26e179a6c664e830a06406a9 (patch) (side-by-side diff)
tree329141983db204e7fb6b78d82e2e7107080d0bf6
parent06bcd227c2806a35d77e9da4c1338d578680e3ed (diff)
downloadopie-a16e4becf2de9b5e26e179a6c664e830a06406a9.zip
opie-a16e4becf2de9b5e26e179a6c664e830a06406a9.tar.gz
opie-a16e4becf2de9b5e26e179a6c664e830a06406a9.tar.bz2
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp24
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
@@ -36,15 +36,14 @@
#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 ( )
{
}
@@ -87,42 +86,39 @@ 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 )