diff --git a/src/declarativeimports/plasmastyle/EditMenuTouch.qml b/src/declarativeimports/plasmastyle/EditMenuTouch.qml index 4c92ebf1a..d01eb7eee 100644 --- a/src/declarativeimports/plasmastyle/EditMenuTouch.qml +++ b/src/declarativeimports/plasmastyle/EditMenuTouch.qml @@ -61,14 +61,9 @@ Item { } function __popup(pos) { - //pos = input.mapToItem(popup, pos.x, pos.y); popup.x = pos.x; popup.y = pos.y; popup.visible = true; - print("POPUP MENU"+pos.y+" "+popup.x+" "+popup.width+" "+popup.parent) - //popup.y = 0 - //popup.parent = input.parent.parent.parent.parent.parent - popup.z = 9999 } function __dismissMenu() { diff --git a/src/declarativeimports/plasmastyle/TextAreaStyle.qml b/src/declarativeimports/plasmastyle/TextAreaStyle.qml index 15a987e95..1ee6fd6b3 100644 --- a/src/declarativeimports/plasmastyle/TextAreaStyle.qml +++ b/src/declarativeimports/plasmastyle/TextAreaStyle.qml @@ -20,6 +20,7 @@ import QtQuick 2.1 import QtQuick.Controls.Styles 1.1 as QtQuickControlStyle +import QtQuick.Controls.Private 1.0 as QtQuickControlsPrivate import QtQuick.Controls 1.1 import org.kde.plasma.core 2.0 as PlasmaCore @@ -67,7 +68,12 @@ QtQuickControlStyle.TextAreaStyle { incrementControl: svs.incrementControl decrementControl: svs.decrementControl + Component { + id: editMenuTouch + EditMenuTouch {} + } + __cursorHandle: CursorHandleStyle {} __selectionHandle: SelectionHandleStyle {} - __editMenu: EditMenuTouch {} + __editMenu: QtQuickControlsPrivate.Settings.isMobile ? editMenuTouch : null } diff --git a/src/declarativeimports/plasmastyle/TextFieldStyle.qml b/src/declarativeimports/plasmastyle/TextFieldStyle.qml index d90b1a88d..1f5c9179e 100644 --- a/src/declarativeimports/plasmastyle/TextFieldStyle.qml +++ b/src/declarativeimports/plasmastyle/TextFieldStyle.qml @@ -19,6 +19,7 @@ import QtQuick 2.0 import QtQuick.Controls.Styles 1.1 as QtQuickControlStyle +import QtQuick.Controls.Private 1.0 as QtQuickControlsPrivate import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents @@ -66,7 +67,12 @@ QtQuickControlStyle.TextFieldStyle { } } + Component { + id: editMenuTouch + EditMenuTouch {} + } + __cursorHandle: CursorHandleStyle {} __selectionHandle: SelectionHandleStyle {} - __editMenu: EditMenuTouch {} + __editMenu: QtQuickControlsPrivate.Settings.isMobile ? editMenuTouch : null }