Enable edit bubble also for TextArea
- split out placeEditBubble(mouse) - improve positioning a bit more (still not perfect) - Remove a bit of noise
This commit is contained in:
Sebastian Kügler
parent
10b4ad517d
commit
e66e97e11e
@ -63,7 +63,7 @@ install(FILES qml/TabBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/t
|
||||
install(FILES qml/TabButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
install(FILES qml/TabGroup.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
install(FILES qml/TabGroup.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
install(FILES qml/TextArea.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
#install(FILES qml/TextArea.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
#install(FILES qml/TextField.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
install(FILES qml/ToolBarLayout.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
install(FILES qml/ToolBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
function placeEditBubble(mouse) {
|
||||
// Find the root item, then map our cursor position to it
|
||||
// in order to check if the edit bubble could end up off-screen
|
||||
var rootItem = parent;
|
||||
while (rootItem.parent) {
|
||||
rootItem = rootItem.parent;
|
||||
}
|
||||
var distanceToTop = mouseEventListener.mapToItem(rootItem, mouse.x, mouse.y);
|
||||
print( " distanceToTop: " + distanceToTop.x);
|
||||
if (distanceToTop.x < editBubble.width/2) {
|
||||
// hitting the left edge
|
||||
//editBubble.x = mouse.x
|
||||
|
||||
} else {
|
||||
editBubble.x = mouse.x-(editBubble.width/2)
|
||||
}
|
||||
if (distanceToTop.y > editBubble.height) {
|
||||
editBubble.y = mouse.y-editBubble.height-8
|
||||
} else {
|
||||
//editBubble.y = mouse.y-(editBubble.width/2)
|
||||
}
|
||||
|
||||
}
|
||||
@ -25,6 +25,7 @@ PlasmaCore.FrameSvgItem {
|
||||
id: editBubble
|
||||
objectName: "editBubble"
|
||||
property int iconSize: 32;
|
||||
|
||||
imagePath: "dialogs/background"
|
||||
width: (iconSize*2) + iconSize
|
||||
height: iconSize*2
|
||||
@ -49,7 +50,7 @@ PlasmaCore.FrameSvgItem {
|
||||
enabled: textInput.canPaste
|
||||
MouseArea {
|
||||
anchors.fill: parent;
|
||||
onClicked: textField.paste();
|
||||
onClicked: { textField.paste(); editBubble.state = "collapsed"; }
|
||||
onPressed: PropertyAnimation { target: pasteIcon; properties: "scale";
|
||||
from: 1.0; to: 0.9;
|
||||
duration: 175; easing.type: Easing.OutExpo; }
|
||||
@ -66,7 +67,7 @@ PlasmaCore.FrameSvgItem {
|
||||
enabled: textInput.selectedText != ""
|
||||
MouseArea {
|
||||
anchors.fill: parent;
|
||||
onClicked: textField.copy();
|
||||
onClicked: { textField.copy(); editBubble.state = "collapsed"; }
|
||||
onPressed: PropertyAnimation { target: copyIcon; properties: "scale";
|
||||
from: 1.0; to: 0.9;
|
||||
duration: 175; easing.type: Easing.OutExpo; }
|
||||
|
||||
@ -0,0 +1,247 @@
|
||||
/*
|
||||
* Copyright (C) 2011 by Daker Fernandes Pinheiro <dakerfp@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Library General Public License as
|
||||
* published by the Free Software Foundation; either version 2, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this program; if not, write to the
|
||||
* Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
import QtQuick 1.1
|
||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
||||
import org.kde.qtextracomponents 0.1
|
||||
import "EditBubble.js" as EditBubbleHelper
|
||||
|
||||
Item {
|
||||
id: textArea
|
||||
|
||||
// Common API
|
||||
property alias font: textEdit.font // alias to textEdit.font
|
||||
property int inputMethodHints
|
||||
property bool errorHighlight
|
||||
property alias cursorPosition: textEdit.cursorPosition
|
||||
property alias horizontalAlignment: textEdit.cursorPosition
|
||||
property alias verticalAlignment: textEdit.cursorPosition
|
||||
property alias readOnly: textEdit.readOnly
|
||||
property alias selectedText: textEdit.selectedText // read-only
|
||||
property alias selectionEnd: textEdit.selectionEnd // read-only
|
||||
property alias selectionStart: textEdit.selectionStart // read-only
|
||||
property alias text: textEdit.text
|
||||
property alias textFormat: textEdit.textFormat // enumeration
|
||||
property alias wrapMode: textEdit.wrapMode // enumeration
|
||||
property string placeholderText
|
||||
|
||||
property alias textField: textArea
|
||||
|
||||
// functions
|
||||
function copy() {
|
||||
textEdit.copy();
|
||||
}
|
||||
|
||||
function paste() {
|
||||
textEdit.paste();
|
||||
}
|
||||
|
||||
function cut() {
|
||||
textEdit.cut();
|
||||
}
|
||||
|
||||
function select(start, end) {
|
||||
textEdit.select(start, end);
|
||||
}
|
||||
|
||||
function selectAll() {
|
||||
textEdit.selectAll();
|
||||
}
|
||||
|
||||
function selectWord() {
|
||||
textEdit.selectWord();
|
||||
}
|
||||
|
||||
function positionAt(pos) {
|
||||
textEdit.positionAt(pos);
|
||||
}
|
||||
|
||||
function positionToRectangle(pos) {
|
||||
textEdit.positionToRectangle(pos);
|
||||
}
|
||||
|
||||
// Plasma API
|
||||
property alias interactive: flickArea.interactive
|
||||
property alias contentMaxWidth: textEdit.width
|
||||
property alias contentMaxHeight: textEdit.height
|
||||
property alias textInput: textEdit
|
||||
|
||||
// Set active focus to it's internal textInput.
|
||||
// Overriding QtQuick.Item forceActiveFocus function.
|
||||
function forceActiveFocus() {
|
||||
textEdit.forceActiveFocus();
|
||||
}
|
||||
|
||||
// Overriding QtQuick.Item activeFocus property.
|
||||
property alias activeFocus: textEdit.activeFocus
|
||||
|
||||
opacity: enabled ? 1.0 : 0.5
|
||||
|
||||
TextFieldFocus {
|
||||
id: hover
|
||||
state: textArea.activeFocus ? "focus" : (mouseWatcher.containsMouse ? "hover" : "hidden")
|
||||
anchors.fill: base
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: mouseWatcher
|
||||
anchors.fill: hover
|
||||
hoverEnabled: true
|
||||
}
|
||||
|
||||
PlasmaCore.FrameSvgItem {
|
||||
id: base
|
||||
|
||||
// TODO: see what is the best policy for margins
|
||||
anchors {
|
||||
fill: parent
|
||||
}
|
||||
imagePath: "widgets/lineedit"
|
||||
prefix: "base"
|
||||
}
|
||||
|
||||
Flickable {
|
||||
id: flickArea
|
||||
anchors {
|
||||
fill: parent
|
||||
leftMargin: 2 * base.margins.left
|
||||
rightMargin: 2 * base.margins.right + (verticalScroll.visible ? verticalScroll.width : 0)
|
||||
topMargin: 2 * base.margins.top
|
||||
bottomMargin: 2 * base.margins.bottom + (horizontalScroll.visible ? verticalScroll.width : 0)
|
||||
}
|
||||
interactive: !verticalScroll.interactive //textArea.activeFocus
|
||||
contentWidth: {
|
||||
if (textEdit.wrapMode == TextEdit.NoWrap)
|
||||
return textEdit.paintedWidth;
|
||||
|
||||
return Math.min(textEdit.paintedWidth, textEdit.width);
|
||||
}
|
||||
contentHeight: Math.min(textEdit.paintedHeight, textEdit.height)
|
||||
clip: true
|
||||
MouseEventListener {
|
||||
id: mouseEventListener
|
||||
//anchors.fill: parent
|
||||
onPressed: forceActiveFocus();
|
||||
//onPressed: print(" MouseEventListener Pressed");
|
||||
onPressAndHold: {
|
||||
print(" *** MouseEventListener PressAndHold");
|
||||
//forceActiveFocus();
|
||||
EditBubbleHelper.placeEditBubble(mouse);
|
||||
editBubble.state = (textInput.activeFocus && (textInput.selectedText != "" || textInput.canPaste)) ? "expanded" : "collapsed";
|
||||
}
|
||||
onPositionChanged: {
|
||||
EditBubbleHelper.placeEditBubble(mouse);
|
||||
}
|
||||
}
|
||||
|
||||
TextEdit {
|
||||
id: textEdit
|
||||
parent: mouseEventListener
|
||||
width: flickArea.width
|
||||
height: flickArea.height
|
||||
clip: true
|
||||
wrapMode: TextEdit.Wrap
|
||||
enabled: textArea.enabled
|
||||
font.capitalization: theme.defaultFont.capitalization
|
||||
font.family: theme.defaultFont.family
|
||||
font.italic: theme.defaultFont.italic
|
||||
font.letterSpacing: theme.defaultFont.letterSpacing
|
||||
font.pointSize: theme.defaultFont.pointSize
|
||||
font.strikeout: theme.defaultFont.strikeout
|
||||
font.underline: theme.defaultFont.underline
|
||||
font.weight: theme.defaultFont.weight
|
||||
font.wordSpacing: theme.defaultFont.wordSpacing
|
||||
color: theme.viewTextColor
|
||||
selectByMouse: verticalScroll.interactive
|
||||
|
||||
onCursorPositionChanged: {
|
||||
if (cursorRectangle.x < flickArea.contentX) {
|
||||
flickArea.contentX = cursorRectangle.x;
|
||||
return;
|
||||
}
|
||||
|
||||
if (cursorRectangle.x > flickArea.contentX +
|
||||
flickArea.width - cursorRectangle.width) {
|
||||
flickArea.contentX = cursorRectangle.x -
|
||||
cursorRectangle.width;
|
||||
return;
|
||||
}
|
||||
|
||||
if (cursorRectangle.y < flickArea.contentY) {
|
||||
flickArea.contentY = cursorRectangle.y;
|
||||
return;
|
||||
}
|
||||
|
||||
if (cursorRectangle.y > flickArea.contentY +
|
||||
flickArea.height - cursorRectangle.height) {
|
||||
flickArea.contentY = cursorRectangle.y -
|
||||
cursorRectangle.height;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Proxying keys events is not required by the
|
||||
// common API but is desired in the plasma API.
|
||||
Keys.onPressed: textArea.Keys.pressed(event);
|
||||
Keys.onReleased: textArea.Keys.released(event);
|
||||
|
||||
Text {
|
||||
anchors.fill: parent
|
||||
text: textArea.placeholderText
|
||||
visible: textEdit.text == "" && !textArea.activeFocus
|
||||
opacity: 0.5
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ScrollBar {
|
||||
id: horizontalScroll
|
||||
anchors {
|
||||
bottom: parent.bottom
|
||||
left: parent.left
|
||||
right: flickArea.right
|
||||
}
|
||||
enabled: parent.enabled
|
||||
flickableItem: flickArea
|
||||
orientation: Qt.Horizontal
|
||||
stepSize: textEdit.font.pixelSize
|
||||
}
|
||||
|
||||
ScrollBar {
|
||||
id: verticalScroll
|
||||
anchors {
|
||||
right: parent.right
|
||||
top: parent.top
|
||||
bottom: flickArea.bottom
|
||||
}
|
||||
enabled: parent.enabled
|
||||
flickableItem: flickArea
|
||||
orientation: Qt.Vertical
|
||||
stepSize: textEdit.font.pixelSize
|
||||
}
|
||||
|
||||
EditBubble { id: editBubble; iconSize: 32; }
|
||||
|
||||
onActiveFocusChanged: {
|
||||
if (!activeFocus) {
|
||||
editBubble.state = "collapsed";
|
||||
//print("Hiding...");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -20,6 +20,7 @@
|
||||
import QtQuick 1.1
|
||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
||||
import org.kde.qtextracomponents 0.1
|
||||
import "EditBubble.js" as EditBubbleHelper
|
||||
|
||||
Item {
|
||||
id: textField
|
||||
@ -188,51 +189,28 @@ Item {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: {
|
||||
//print("clear button clicked");
|
||||
textInput.text = "";
|
||||
textInput.forceActiveFocus();
|
||||
editBubble.state = "collapsed"
|
||||
}
|
||||
//Rectangle { anchors.fill: parent; color: "green"; opacity: 0.3; }
|
||||
}
|
||||
}
|
||||
|
||||
MouseEventListener {
|
||||
id: mouseEventListener
|
||||
anchors.fill: parent
|
||||
//onPressed: print(" MouseEventListener Pressed");
|
||||
onPressAndHold: {
|
||||
print(" *** MouseEventListener PressAndHold");
|
||||
placeEditBubble(mouse);
|
||||
EditBubbleHelper.placeEditBubble(mouse);
|
||||
editBubble.state = (textInput.activeFocus && (textInput.selectedText != "" || textInput.canPaste)) ? "expanded" : "collapsed";
|
||||
}
|
||||
onPositionChanged: {
|
||||
placeEditBubble(mouse);
|
||||
EditBubbleHelper.placeEditBubble(mouse);
|
||||
}
|
||||
}
|
||||
|
||||
function placeEditBubble(mouse) {
|
||||
// Find the root item, then map our cursor position to it
|
||||
// in order to check if the edit bubble could end up off-screen
|
||||
var rootItem = parent;
|
||||
while (rootItem.parent) {
|
||||
rootItem = rootItem.parent;
|
||||
}
|
||||
var distanceToTop = mouseEventListener.mapToItem(rootItem, mouse.x, mouse.y);
|
||||
print( " distanceToTop: " + distanceToTop.y);
|
||||
if (distanceToTop.y > editBubble.height) {
|
||||
editBubble.x = mouse.x-(editBubble.width/2)
|
||||
editBubble.y = mouse.y-editBubble.height-8
|
||||
} else {
|
||||
editBubble.x = mouse.x-(editBubble.width/2)
|
||||
editBubble.y = mouse.y+8
|
||||
}
|
||||
|
||||
}
|
||||
onActiveFocusChanged: {
|
||||
if (!activeFocus) {
|
||||
editBubble.state = "collapsed";
|
||||
//print("Hiding...");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -97,7 +97,7 @@ bool MouseEventListener::sceneEventFilter(QGraphicsItem *item, QEvent *event)
|
||||
const QPointF myPos = item->mapToItem(this, me->pos());
|
||||
QDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
|
||||
m_pressAndHoldEvent = new QDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
|
||||
kDebug() << "pressed in sceneEventFilter";
|
||||
//kDebug() << "pressed in sceneEventFilter";
|
||||
emit pressed(&dme);
|
||||
m_pressed = true;
|
||||
//delete m_pressAndHoldEvent;
|
||||
@ -110,7 +110,7 @@ bool MouseEventListener::sceneEventFilter(QGraphicsItem *item, QEvent *event)
|
||||
QGraphicsSceneMouseEvent *me = static_cast<QGraphicsSceneMouseEvent *>(event);
|
||||
const QPointF myPos = item->mapToItem(this, me->pos());
|
||||
QDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
|
||||
kDebug() << "positionChanged..." << dme.x() << dme.y();
|
||||
//kDebug() << "positionChanged..." << dme.x() << dme.y();
|
||||
m_pressAndHoldEvent = new QDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
|
||||
emit positionChanged(&dme);
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user