FCL/sf/app/browserui: comparison ginebra2/EditorWidget.cpp

equal deleted inserted replaced

-:6aeb7a756187
+:3c88a81ff781
 #endif
 #include "EditorWidget.h"
 #include "Utilities.h"
 #include "ChromeEffect.h"
+#include "qstmgestureevent.h"
 // FIXME ;;; Must address the following issues:
 //
 // * Clean ORBIT_UI flag by creating new class for orbit ui
 // * Replace QGraphicsTextItem with HbTextItem for orbit ui
 GTextLineItem::GTextLineItem(QGraphicsItem * parent)
 : QGraphicsTextItem(parent)
 , m_maxTextLength(0)
 , m_hints(Qt::ImhNoPredictiveText) // disable the predictive text
 , m_setSpecificBtn(false)
+, m_isContextMenuOn(false)
 {
 // Disable wrapping, force text to be stored and displayed
 // as a single line.
 QTextOption textOption = document()->defaultTextOption();
 textOption.setWrapMode(QTextOption::NoWrap);
 document()->setDefaultTextOption(textOption);
+// Set default font size
+QFont textFont = font();
+textFont.setPointSize(11);
+setFont(textFont);
 // Enable cursor keys.
 setTextInteractionFlags(Qt::TextEditorInteraction);
 // This is needed to initialize m_textLine.
 setText("");
 setAcceptDrops(false);
 m_defaultStartDragDistance = QApplication::startDragDistance();
-}
+grabGesture(QStm_Gesture::assignedType());
+installEventFilter(this);
+}
 GTextLineItem::~GTextLineItem()
 {
 if (m_maxTextLength > 0)
 disconnect(document(), SIGNAL(contentsChange(int, int, int)), this, SLOT(contentsChange(int, int, int)));
 }
 }
 void GTextLineItem::specificBtnTriggered(bool checked)
 {
+Q_UNUSED(checked);
 #ifdef ORBIT_UI
 QInputContext *ic = qApp->inputContext();
 QInputMethodEvent *imEvent = new QInputMethodEvent();
 imEvent->setCommitString(QString(m_spBtnCommitString));
 if (ic)
 emit cursorXChanged(cursorX());
 }
 void GTextLineItem::unselect()
 {
+if (contextMenuOn())
+return;
 QTextCursor tc = textCursor();
 tc.setPosition(tc.position());
 setTextCursor(tc);
 }
 }
 }
 void GTextLineItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
 {
+event->setPos(QPointF(event->pos().x(), boundingRect().center().y())); // make selecting easily by using a fixed y position
 QGraphicsTextItem::mouseMoveEvent(event);
 emit cursorXChanged(cursorX());
 }
 void GTextLineItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
 {
+event->setPos(QPointF(event->pos().x(), boundingRect().center().y())); // make selecting easily by using a fixed y position
 QGraphicsTextItem::mousePressEvent(event);
 }
 void GTextLineItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
 {
+if (contextMenuOn())
+return;
+event->setPos(QPointF(event->pos().x(), boundingRect().center().y())); // make selecting easily by using a fixed y position
 QGraphicsTextItem::mouseReleaseEvent(event);
 QPointF pos = event->pos();
 emit tapped(pos);
 launchVKB();
 }
 QApplication::setStartDragDistance(1000);
 QGraphicsTextItem::focusInEvent(event);
 #ifndef ORBIT_UI
 QWidget* fw = QApplication::focusWidget();
-Qt::InputMethodHints hints = fw->inputMethodHints();
+if (fw != NULL) {
-if (hints != m_hints)
+Qt::InputMethodHints hints = fw->inputMethodHints();
-fw->setInputMethodHints(m_hints);
+if (hints != m_hints)
+fw->setInputMethodHints(m_hints);
+}
 #endif
 if (event->reason() != Qt::PopupFocusReason) // to fix the special char issue on VKB
 emit focusChanged(true);
 }
 {
 Q_UNUSED(event);
 // restore the drag & drop for other components
 QApplication::setStartDragDistance(m_defaultStartDragDistance);
 QGraphicsTextItem::focusOutEvent(event);
-if (event->reason() != Qt::PopupFocusReason && event->reason() != Qt::ActiveWindowFocusReason) // to fix the special char issue on VKB
+if (event->reason() != Qt::PopupFocusReason && event->reason() != Qt::ActiveWindowFocusReason && !contextMenuOn()) // to fix the special char issue on VKB
 emit focusChanged(false);
 }
 void GTextLineItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {
 void GTextLineItem::setInputMethodHints(Qt::InputMethodHints hints)
 {
 m_hints = hints;
 m_hints |= Qt::ImhNoPredictiveText;  // disable the predictive text
 }
+bool GTextLineItem::eventFilter(QObject* o, QEvent* e)
+{
+if (e->type() == QEvent::GraphicsSceneMouseMove)
+return false;
+	return QStm_GestureEventFilter::instance()->eventFilter(o, e);
+}
+bool GTextLineItem::event(QEvent* event)
+{
+bool ret = false;
+if (event->type() == QEvent::Gesture) {
+QStm_Gesture* gesture = getQStmGesture(event);
+if (gesture) {
+return  handleQStmGesture(gesture);
+}
+}
+ret = QGraphicsTextItem::event(event);
+return ret;
+}
+bool GTextLineItem::handleQStmGesture(QStm_Gesture* gesture)
+{
+QStm_GestureType type = gesture->getGestureStmType();
+if (type == QStmLongPressGestureType) {
+emit contextEvent(hasSelection());
+}
+else {
+QEvent::Type mouseEventType = gesture->gestureType2GraphicsSceneMouseType();
+if (mouseEventType == QEvent::GraphicsSceneMousePress ||
+mouseEventType == QEvent::GraphicsSceneMouseRelease) {
+QGraphicsSceneMouseEvent gsme(mouseEventType);
+QPointF pos = gesture->scenePosition(this);
+qstmSetGraphicsSceneMouseEvent(pos, this, gsme);
+switch (mouseEventType) {
+case QEvent::GraphicsSceneMousePress:
+mousePressEvent(&gsme);
+break;
+case QEvent::GraphicsSceneMouseRelease:
+mouseReleaseEvent(&gsme);
+break;
+case QEvent::GraphicsSceneMouseMove:
+mouseMoveEvent(&gsme);
+break;
+}
+}
+}
+	return true;
+}
 void  GTextLineItem::launchVKB() {
 // add specific button
 ic->filterEvent(event);
 delete event;
 }
 }
+void GTextLineItem::cut() {
+QTextCursor tc = textCursor();
+QApplication::clipboard()->setText(tc.selectedText());
+tc.insertText("");
+setTextCursor(tc);
+}
+void GTextLineItem::copy() {
+QTextCursor tc = textCursor();
+QApplication::clipboard()->setText(tc.selectedText());
+}
+void GTextLineItem::paste() {
+QTextCursor tc = textCursor();
+tc.insertText(QApplication::clipboard()->text(QClipboard::Clipboard));
+setTextCursor(tc);
+}
 // Methods for class GLineEditor
 // GLineEditor is a QGraphicsWidget that wraps a GTextLineItem to implement scrolling,
 // draw a background and set padding
 GLineEditor::GLineEditor(ChromeSnippet * snippet, ChromeWidget * chrome, QGraphicsItem * parent)
 Q_UNUSED(snippet);
 // The viewport clips the editor when text overflows
 // viewport size will be set in resize()
 m_viewPort = new QGraphicsWidget(this);
+m_viewPort->setObjectName("ViewPort");
 m_viewPort->setFlags(QGraphicsItem::ItemClipsChildrenToShape);
 // The actual text editor item
 //m_textColor = QColor(Qt::black);
 m_editor = new GTextLineItem(m_viewPort);
+m_editor->setObjectName("LineItem");
 #ifndef BROWSER_LAYOUT_TENONE
 m_editor->setDefaultTextColor(m_textColor);
 #endif
 m_editor->installEventFilter(this);
 #ifdef BROWSER_LAYOUT_TENONE
 m_titleColor = QColor(Qt::white);
 m_title = new GTitleItem(m_viewPort);
+m_title->setObjectName("TitleItem");
 m_title->setDefaultTextColor(m_titleColor);
 m_title->hide();
 safe_connect(m_title, SIGNAL(tapped(QPointF& )),
 this, SIGNAL(titleMouseEvent(QPointF&)));
 #endif
 this, SIGNAL(focusChanged(bool)));
 safe_connect(m_editor, SIGNAL(tapped(QPointF&)),
 this, SIGNAL(tapped(QPointF&)));
+safe_connect(m_editor, SIGNAL(contextEvent(bool)),
+this, SIGNAL(contextEvent(bool)));
 setAcceptDrops(false);
 }
 GLineEditor::~GLineEditor()
 {
 m_textColor = color;
 m_editor->setDefaultTextColor(m_textColor);
 }
 #ifdef BROWSER_LAYOUT_TENONE
-void GLineEditor::setTitleColor(QColor & color)
+void GLineEditor::setTitleColor(QColor & color) {
-{
 m_titleColor = color;
 m_title->setDefaultTextColor(m_titleColor);
 }
-void GLineEditor::setTitleFont(QFont & font)
+void GLineEditor::setTitleFont(QFont & font) {
-{
 m_title->setFont(font);
+}
+void GLineEditor::setTextFont(QFont & font) {
+m_editor->setFont(font);
 }
 #endif
 void GLineEditor::setPadding(qreal padding)
 {
 painter->save();
 painter->setRenderHint(QPainter::Antialiasing);
 // First, fill rectangle with background color.
 painter->fillRect(boundingRect(), m_backgroundColor);
 painter->restore();
+#ifdef BROWSER_LAYOUT_TENONE
+if(!isEnabled() && !m_title->isVisible()) {
+#else
 if(!isEnabled()) {
+#endif
 ChromeEffect::paintDisabledRect(painter, option->exposedRect);
 }
 // Make sure any required horizontal scrolling happens
 // before rendering editor widget, which will be drawn on top
 // of the background rectangle.
 }
 void GLineEditor::resizeEvent(QGraphicsSceneResizeEvent * event)
 {
 QSizeF size = event->newSize();
-qreal height = size.height() - m_padding * 2;
+qreal height = size.height();
 qreal width;
 width = m_viewPortWidth  = size.width() - m_rightTextMargin  - m_padding * 2;
 #ifdef BROWSER_LAYOUT_TENONE
 m_title->setTextWidth(m_titleModeWidth);
 #endif
 m_viewPort->setGeometry(
 m_padding,
-(size.height() - m_editor->boundingRect().height()) / 2,
+0,
 width,
 height);
 m_editor->setTextWidth(m_viewPortWidth);
 // move back the m_editor'x to 0
 painter->setRenderHint(QPainter::Antialiasing);
 painter->fillRect(boundingRect(), m_backgroundColor);
 painter->fillRect(progressRect, m_progressColor);
 paintBorder(painter);
 painter->restore();
+#ifdef BROWSER_LAYOUT_TENONE
+if(!isEnabled() && !m_title->isVisible()) {
+#else
 if(!isEnabled()) {
+#endif
 ChromeEffect::paintDisabledRect(painter, option->exposedRect);
 }
 }
 void GProgressEditor::setProgress(int percent)
 //A chrome item that displays a GTextEditor. This can be embedded in HTML chrome instead of an input field.
 TextEditItem::TextEditItem(ChromeSnippet * snippet, ChromeWidget * chrome, QGraphicsItem * parent)
 : NativeChromeItem(snippet, parent)
-	, m_justFocusIn(false)
+, m_justFocusIn(false)
 {
 m_textEditor = new GTextEditor(snippet, chrome, this);
+m_textEditor->setObjectName("Editor");
 //Style via CSS
 QWebElement we = m_snippet->element();
 QColor textColor;
 //Padding sets the "border" width
 QString cssPadding = we.styleProperty("padding-top", QWebElement::ComputedStyle);
 m_textEditor->setPadding(cssPadding.remove("px").toInt());
-	safe_connect(m_textEditor, SIGNAL(focusChanged(bool)),this, SLOT(focusChanged(bool)));
+safe_connect(m_textEditor, SIGNAL(focusChanged(bool)),this, SLOT(focusChanged(bool)));
 safe_connect(m_textEditor, SIGNAL(tapped(QPointF&)),this, SLOT(tapped(QPointF&)));
-}
+safe_connect(m_textEditor, SIGNAL(contextEvent(bool)), this, SIGNAL(contextEvent(bool)));
+}
 void TextEditItem::tapped(QPointF& pos)
 {
 bool hitText = m_textEditor->tappedOnText(pos.x());
-if (!m_justFocusIn && !hitText)
-m_textEditor->unselect();
 if (m_justFocusIn) {
 m_justFocusIn = false;
 if (hitText && !m_textEditor->hasSelection())
 m_textEditor->selectAll();
 }
 }
 void TextEditItem::focusChanged(bool focusIn)
 {
 if (focusIn)
 m_justFocusIn = true;
 else {
 m_justFocusIn = false;
 m_textEditor->unselect();
 m_textEditor->shiftToLeftEnd();
 }
 }
 TextEditItem::~TextEditItem()
 {
 delete m_textEditor;
 }

changeset 16	3c88a81ff781
parent 12	afcd8e6d025b