Changeset 769 for trunk/demos/embedded/anomaly/src

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/embedded/anomaly/src/BrowserView.cpp (modified) (1 diff)
• demos/embedded/anomaly/src/ControlStrip.cpp (modified) (6 diffs)
• demos/embedded/anomaly/src/ControlStrip.h (modified) (2 diffs)
• demos/embedded/anomaly/src/anomaly.qrc (modified) (1 diff)
• demos/embedded/anomaly/src/images/button-close.png (copied) (copied from branches/vendor/nokia/qt/4.6.3/demos/embedded/anomaly/src/images/button-close.png )

trunk/demos/embedded/anomaly/src/BrowserView.cpp

@@ -83 +83 @@
     connect(m_controlStrip, SIGNAL(backClicked()), m_webView, SLOT(back()));
     connect(m_controlStrip, SIGNAL(forwardClicked()), m_webView, SLOT(forward()));
+
 
     QPalette pal = m_webView->palette();

trunk/demos/embedded/anomaly/src/ControlStrip.cpp

@@ -51 +51 @@
     backPixmap.load(":/images/go-previous.png");
     forwardPixmap.load(":/images/go-next.png");
+
 }
 
@@ -66 +67 @@
 {
     int h = height();
+
     int x = event->pos().x();
 
@@ -75 +77 @@
 
     if (x > width() - h) {
+
+
+
+
+
+
         emit forwardClicked();
         event->accept();
@@ -80 +88 @@
     }
 
-    if ((x < width() - 2 * h) && (x > width() - 3 * h)) {
+    if ((x < width() - )) {
         emit backClicked();
         event->accept();
@@ -90 +98 @@
 {
     int h = height();
-    int s = (h - menuPixmap.height()) / 2;
+    int spacing = qMin(h, (width() - h * 4) / 3);
+    int s = (height() - menuPixmap.height()) / 2;
 
     QPainter p(this);
@@ -96 +105 @@
     p.setCompositionMode(QPainter::CompositionMode_SourceOver);
     p.drawPixmap(s, s, menuPixmap);
-    p.drawPixmap(width() - 3 * h + s, s, backPixmap);
-    p.drawPixmap(width() - h + s, s, forwardPixmap);
+    p.drawPixmap(width() - h + s, s, closePixmap);
+    p.drawPixmap(width() - (h * 2 + spacing) + s, s, forwardPixmap);
+    p.drawPixmap(width() - (h * 3 + spacing * 2) + s, s, backPixmap);
+
     p.end();
 }

trunk/demos/embedded/anomaly/src/ControlStrip.h

@@ -59 +59 @@
     void backClicked();
     void forwardClicked();
+
 
 protected:
@@ -68 +69 @@
     QPixmap backPixmap;
     QPixmap forwardPixmap;
+
 };
 

trunk/demos/embedded/anomaly/src/anomaly.qrc

@@ -6 +6 @@
         <file>images/list-add.png</file>
         <file>images/list-remove.png</file>
+
     </qresource>
 </RCC>