S60Style: Styled graphic support for editors.

3 files changed, 34 insertions, 2 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index ab2c2ff..6d24d54 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -63,6 +63,7 @@
 #include "qtabbar.h"
 #include "qtablewidget.h"
 #include "qtableview.h"
+#include "qtextedit.h"
 #include "qtoolbar.h"
 #include "qtoolbutton.h"
 #include "qtreeview.h"
@@ -140,6 +141,7 @@ const struct QS60StylePrivate::frameElementCenter QS60StylePrivate::m_frameEleme
     {SE_ToolBarButtonPressed,   QS60StyleEnums::SP_QsnFrSctrlButtonCenterPressed},
     {SE_PanelBackground,        QS60StyleEnums::SP_QsnFrSetOptCenter},
     {SE_ButtonInactive,         QS60StyleEnums::SP_QsnFrButtonCenterInactive},
+    {SE_Editor,                 QS60StyleEnums::SP_QsnFrNotepadCenter},
 };
 
 static const int frameElementsCount =
@@ -276,6 +278,9 @@ void QS60StylePrivate::drawSkinElement(SkinElements element, QPainter *painter,
     case SE_ButtonInactive:
         drawFrame(SF_ButtonInactive, painter, rect, flags | SF_PointNorth);
         break;
+    case SE_Editor:
+        drawFrame(SF_Editor, painter, rect, flags | SF_PointNorth);
+        break;        
     default:
         break;
     }
@@ -1875,6 +1880,12 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
         }
         break;
 #endif //QT_NO_TOOLBAR
+    case CE_ShapedFrame: {
+        const QTextEdit *txt = qobject_cast<const QTextEdit *>(widget);                
+        if (txt)
+            QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_Editor, painter, option->rect, flags);
+    }
+        break;
     default:
         QCommonStyle::drawControl(element, option, painter, widget);
     }
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 54da9e8..7240978 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -270,7 +270,16 @@ public:
         SP_QsnFrButtonSideBInactive,
         SP_QsnFrButtonSideLInactive,
         SP_QsnFrButtonSideRInactive,
-        SP_QsnFrButtonCenterInactive
+        SP_QsnFrButtonCenterInactive,        
+        SP_QsnFrNotepadCornerTl,
+        SP_QsnFrNotepadCornerTr,
+        SP_QsnFrNotepadCornerBl,
+        SP_QsnFrNotepadCornerBr,
+        SP_QsnFrNotepadSideT,
+        SP_QsnFrNotepadSideB,
+        SP_QsnFrNotepadSideL,
+        SP_QsnFrNotepadSideR,
+        SP_QsnFrNotepadCenter
     };
 
     enum ColorLists {
@@ -332,6 +341,7 @@ public:
         SE_ScrollBarHandlePressedHorizontal, //only for 5.0+
         SE_ScrollBarHandlePressedVertical,
         SE_ButtonInactive,
+        SE_Editor,
     };
 
     enum SkinFrameElements {
@@ -349,6 +359,7 @@ public:
         SF_ToolBarButtonPressed,
         SF_PanelBackground,
         SF_ButtonInactive,
+        SF_Editor,
     };
 
     enum SkinElementFlag {
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index dbb98c5..1f02efa 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -317,7 +317,17 @@ const partMapEntry QS60StyleModeSpecifics::m_partMap[] = {
     /* SP_QsnFrButtonSideBInactive */    {KAknsIIDQsnFrButtonTbSideB,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b6},
     /* SP_QsnFrButtonSideLInactive */    {KAknsIIDQsnFrButtonTbSideL,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b7},
     /* SP_QsnFrButtonSideRInactive */    {KAknsIIDQsnFrButtonTbSideR,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b8},
-    /* SP_QsnFrButtonCenterInactive */   {KAknsIIDQsnFrButtonTbCenter,          EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b9}
+    /* SP_QsnFrButtonCenterInactive */   {KAknsIIDQsnFrButtonTbCenter,          EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b9},  
+    
+    /*SP_QsnFrNotepadCornerTl */         {KAknsIIDQsnFrNotepadCornerTl,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCornerTr */        {KAknsIIDQsnFrNotepadCornerTr,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCornerBl */        {KAknsIIDQsnFrNotepadCornerBl,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCornerBr */        {KAknsIIDQsnFrNotepadCornerBr,         ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideT */           {KAknsIIDQsnFrNotepadSideT,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideB */           {KAknsIIDQsnFrNotepadSideB,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideL */           {KAknsIIDQsnFrNotepadSideL,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideR */           {KAknsIIDQsnFrNotepadSideR,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCenter */          {KAknsIIDQsnFrNotepadCenter,           EDrawIcon,   ES60_AllReleases,    -1,-1}
 
 };