Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

5 files changed, 63 insertions, 40 deletions

diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index 9ce9724..50f8a12 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -65,6 +65,7 @@ private:
     void commitCurrentString();
     void updateHints();
     void applyHints(Qt::InputMethodHints hints);
+    void applyFormat(QList<QInputMethodEvent::Attribute> *attributes);
 
     // From MCoeFepAwareTextEditor
 public:
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 1ae3d79..8612e55 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -465,6 +465,37 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
     CCoeEnv::Static()->InputCapabilitiesChanged();
 }
 
+void QCoeFepInputContext::applyFormat(QList<QInputMethodEvent::Attribute> *attributes)
+{
+    TCharFormat cFormat;
+    TInt numChars = 0;
+    TInt charPos = 0;
+    int oldSize = attributes->size();
+    while (m_formatRetriever) {
+        m_formatRetriever->GetFormatOfFepInlineText(cFormat, numChars, charPos);
+        if (numChars <= 0) {
+            // This shouldn't happen according to S60 docs, but apparently does sometimes.
+            break;
+        }
+        attributes->append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat,
+                                                        charPos,
+                                                        numChars,
+                                                        QVariant(qt_TCharFormat2QTextCharFormat(cFormat))));
+        charPos += numChars;
+        if (charPos >= m_preeditString.size()) {
+            break;
+        }
+    }
+
+    if (attributes->size() == oldSize) {
+        // S60 didn't provide any format, so let's give our own instead.
+        attributes->append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat,
+                                                        0,
+                                                        m_preeditString.size(),
+                                                        standardFormat(PreeditFormat)));
+    }
+}
+
 void QCoeFepInputContext::StartFepInlineEditL(const TDesC& aInitialInlineText,
         TInt aPositionOfInsertionPointInInlineText, TBool aCursorVisibility, const MFormCustomDraw* /*aCustomDraw*/,
         MFepInlineTextFormatRetriever& aInlineTextFormatRetriever,
@@ -485,24 +516,7 @@ void QCoeFepInputContext::StartFepInlineEditL(const TDesC& aInitialInlineText,
     m_formatRetriever = &aInlineTextFormatRetriever;
     m_pointerHandler = &aPointerEventHandlerDuringInlineEdit;
 
-    TCharFormat cFormat;
-    TInt numChars = 0;
-    TInt charPos = 0;
-    while (m_formatRetriever) {
-        m_formatRetriever->GetFormatOfFepInlineText(cFormat, numChars, charPos);
-        if (numChars <= 0) {
-            // This shouldn't happen according to S60 docs, but apparently does sometimes.
-            break;
-        }
-        attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat,
-                                                       charPos,
-                                                       numChars,
-                                                       QVariant(qt_TCharFormat2QTextCharFormat(cFormat))));
-        charPos += numChars;
-        if (charPos >= m_preeditString.size()) {
-            break;
-        }
-    }
+    applyFormat(&attributes);
 
     attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor,
                                                    m_inlinePosition,
@@ -522,6 +536,7 @@ void QCoeFepInputContext::UpdateFepInlineTextL(const TDesC& aNewInlineText,
     m_inlinePosition = aPositionOfInsertionPointInInlineText;
 
     QList<QInputMethodEvent::Attribute> attributes;
+    applyFormat(&attributes);
     attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor,
                                                    m_inlinePosition,
                                                    m_cursorVisibility,
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index c7d156c..00a9225 100644
--- a/src/gui/inputmethod/qinputcontext.cpp
+++ b/src/gui/inputmethod/qinputcontext.cpp
@@ -427,13 +427,6 @@ QTextFormat QInputContext::standardFormat(StandardFormat s) const
     switch (s) {
     case QInputContext::PreeditFormat: {
         fmt.setUnderlineStyle(QTextCharFormat::DashUnderline);
-#ifndef Q_WS_WIN
-        int h1, s1, v1, h2, s2, v2;
-        pal.color(QPalette::Base).getHsv(&h1, &s1, &v1);
-        pal.color(QPalette::Background).getHsv(&h2, &s2, &v2);
-        bg.setHsv(h1, s1, (v1 + v2) / 2);
-        fmt.setBackground(QBrush(bg));
-#endif
         break;
     }
     case QInputContext::SelectionFormat: {
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 1b6bdea..1906025 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -135,8 +135,10 @@ bool QApplicationPrivate::quitOnLastWindowClosed = true;
 
 #ifdef Q_OS_WINCE
 int QApplicationPrivate::autoMaximizeThreshold = -1;
-#endif
 bool QApplicationPrivate::autoSipEnabled = false;
+#else
+bool QApplicationPrivate::autoSipEnabled = true;
+#endif
 
 QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::Type type)
     : QCoreApplicationPrivate(argc, argv)
@@ -1241,6 +1243,8 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
 
     The property only has an effect on platforms which use software input
     panels, such as Windows CE and Symbian.
+
+    The default is platform dependent.
 */
 
 #ifdef Q_OS_WINCE
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 0fdbf13..24c1608 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -617,6 +617,11 @@ void QS60Style::polish(QWidget *widget)
         const QFont suggestedFont = d->s60Font(
                 QS60StyleEnums::FC_Title, widget->font().pointSizeF());
         widget->setFont(suggestedFont);
+    } else if (qobject_cast<QLineEdit *>(widget)) {
+        widgetPalette.setColor(QPalette::All, QPalette::HighlightedText, 
+            QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
+        QApplication::setPalette(widgetPalette, "QLineEdit");
+                
     }
 }
 
@@ -2115,17 +2120,6 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
 #endif
             QCommonStyle::drawPrimitive(element, option, painter, widget);
         } else {
-            if (option->state & State_Children) {
-                QS60StyleEnums::SkinParts skinPart =
-                        (option->state & State_Open) ? QS60StyleEnums::SP_QgnIndiHlColSuper : QS60StyleEnums::SP_QgnIndiHlExpSuper;
-                int minDimension = qMin(option->rect.width(), option->rect.height());
-                const int resizeValue = minDimension >> 1;
-                minDimension += resizeValue; // Adjust the icon bigger because of empty space in svg icon.
-                QRect iconRect(option->rect.topLeft(), QSize(minDimension, minDimension));
-                iconRect.translate(3, 2 - resizeValue);
-                QS60StylePrivate::drawSkinPart(skinPart, painter, iconRect, flags);
-            }
-
             const bool rightLine = option->state & State_Item;
             const bool downLine = option->state & State_Sibling;
             const bool upLine = option->state & (State_Open | State_Children | State_Item | State_Sibling);
@@ -2147,10 +2141,26 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
                 QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect,
                         (flags | QS60StylePrivate::SF_ColorSkinned));
             }
+            
+            if (option->state & State_Children) {
+                QS60StyleEnums::SkinParts skinPart = 
+                        (option->state & State_Open) ? QS60StyleEnums::SP_QgnIndiHlColSuper : QS60StyleEnums::SP_QgnIndiHlExpSuper;                
+                int minDimension = qMin(option->rect.width(), option->rect.height());
+                const int resizeValue = minDimension >> 1;
+                minDimension += resizeValue; // Adjust the icon bigger because of empty space in svg icon.
+                QRect iconRect(option->rect.topLeft(), QSize(minDimension, minDimension));
+                int verticalMagic(0);
+                // magic values for positioning svg icon.
+                if (option->rect.width() <= option->rect.height()) 
+                    verticalMagic = 3;                
+                iconRect.translate(3, verticalMagic - resizeValue);
+                iconRect.adjust(-3,5,0,0);
+                QS60StylePrivate::drawSkinPart(skinPart, painter, iconRect, flags);            
+            }            
         }
-        }
-        break;
-
+        }        
+        break;         
+        
         // todo: items are below with #ifdefs "just in case". in final version, remove all non-required cases
     case PE_FrameLineEdit:
     case PE_IndicatorButtonDropDown: