last bugfixes on opie-eye an imagescrollview. Seems that now all is working

as it should.

3 files changed, 15 insertions, 8 deletions

diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp
index 10da823..76f50e1 100644
--- a/libopie2/opiemm/oimagescrollview.cpp
+++ b/libopie2/opiemm/oimagescrollview.cpp
@@ -207,2 +207,3 @@ void OImageScrollView::setAutoScale(bool how)
     }
+    _newImage = true;
     generateImage();
@@ -350,4 +351,6 @@ void OImageScrollView::apply_gamma(int aValue)
 {
-    if (!_image_data.size().isValid()) return;
+    if (aValue==0 || !_image_data.size().isValid()) return;
     float percent = ((float)aValue/100.0);
+    /* make sure working on a copy */
+    _image_data.detach();
 
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 994fe12..b919ca8 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -48,2 +48,3 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
         this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
+    setKeyCompression(true);
 }
@@ -68,3 +69,2 @@ void ImageView::systemMessage( const QCString& msg, const QByteArray& data )
     QDataStream stream( data, IO_ReadOnly );
-    odebug << "received system message: " << msg << oendl;
     if ( msg == "setCurrentRotation(int)" )
@@ -72,3 +72,2 @@ void ImageView::systemMessage( const QCString& msg, const QByteArray& data )
         stream >> _newrotation;
-        odebug << "received setCurrentRotation(" << _newrotation << ")" << oendl;
         if (!fullScreen()) {
@@ -238,3 +237,2 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
     }
-    odebug << "Popup " << oendl;
     QPopupMenu *m = new QPopupMenu(this);
@@ -291,3 +289,2 @@ void ImageView::focusInEvent(QFocusEvent *)
       // Always do it here, no matter the size.
-    odebug << "Focus in (view)" << oendl;
     //if (fullScreen()) parentWidget()->showNormal();
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 4ee252f..3efbb53 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -651,2 +651,3 @@ void PMainWindow::setupActions()
     m_hBright = new QActionGroup(this,"actioncollection",false),
+    m_hBright->insert(m_setCurrentBrightness);
     m_hBright->insert(m_IncBrightness);
@@ -660,2 +661,7 @@ void PMainWindow::setupBrightness()
     }
+    bool reshow=false;
+    if (m_disp->isVisible()&&m_disp->fullScreen()) {
+        m_disp->hide();
+        reshow = true;
+    }
     int lb = m_disp->Intensity();
@@ -664,2 +670,6 @@ void PMainWindow::setupBrightness()
     }
+    if (reshow) {
+        m_disp->showFullScreen();
+        qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
+    }
 }
@@ -685,3 +695,2 @@ void PMainWindow::setupToolbar()
     m_aTrash->addTo(toolBar);
-//    m_aSetup->addTo(toolBar);
 
@@ -732,4 +741,2 @@ void PMainWindow::setupMenu()
     m_gPrevNext->addTo(dispMenu);
-    m_setCurrentBrightness->addTo(dispMenu);
-    m_setCurrentBrightness->setEnabled(false);
     dispMenu->insertSeparator();