Closing the picker gives open text the keys back; colour edits wait for text editing (12.14d2)
This commit is contained in:
1 parent
27a4fe8428
commit
aa5a44e517
10 files changed
+217
-10
No files matched your search
@@ -1,5 +1,6 @@
|
||||
#include "MenuFixtures.h"
|
||||
#include "InlineTextDrawFixtures.h"
|
||||
#include <QDialog>
|
||||
#include <QClipboard>
|
||||
#include <QElapsedTimer>
|
||||
#include <QAction>
|
||||
@@ -216,14 +217,45 @@ void InlineTextDrawTests::aFreshDraftTakesTheKeysButSparesAField()
|
||||
QTRY_VERIFY(button->hasFocus());
|
||||
beginTextAt(shown.session, QPointF(20, 30));
|
||||
QTRY_VERIFY(shown.canvas->hasFocus());
|
||||
// A focus request leaves open text's keys alone.
|
||||
// Swift's 810c88a: a focus request hands open text the keys.
|
||||
button->setFocus();
|
||||
QTRY_VERIFY(button->hasFocus());
|
||||
shown.canvas->consumeFocusRequest(7);
|
||||
QTest::qWait(50);
|
||||
QVERIFY(button->hasFocus());
|
||||
shown.session.cancelText();
|
||||
QTRY_VERIFY(shown.canvas->hasFocus());
|
||||
button->setFocus();
|
||||
QTRY_VERIFY(button->hasFocus());
|
||||
// A modal dialog keeps the keys, text open or not.
|
||||
QDialog dialog(&shown.window);
|
||||
dialog.open();
|
||||
QTRY_VERIFY(dialog.isVisible());
|
||||
shown.canvas->consumeFocusRequest(8);
|
||||
QTest::qWait(50);
|
||||
QVERIFY(!shown.canvas->hasFocus());
|
||||
dialog.close();
|
||||
shown.window.activateWindow();
|
||||
QVERIFY(QTest::qWaitForWindowActive(&shown.window));
|
||||
QTest::qWait(50);
|
||||
QVERIFY(button->hasFocus() && !shown.canvas->hasFocus());
|
||||
// A panel's field keeps the keys; the canvas waits.
|
||||
QDialog panel(&shown.window, Qt::Tool);
|
||||
auto *entry = new QLineEdit(&panel);
|
||||
panel.show();
|
||||
panel.activateWindow();
|
||||
QVERIFY(QTest::qWaitForWindowActive(&panel));
|
||||
entry->setFocus();
|
||||
QTRY_VERIFY(entry->hasFocus());
|
||||
shown.canvas->consumeFocusRequest(9);
|
||||
QTest::qWait(50);
|
||||
QCOMPARE(QApplication::activeWindow(), &panel);
|
||||
QTest::keyClicks(entry, QStringLiteral("panel"));
|
||||
QCOMPARE(entry->text(), QString("panel"));
|
||||
QVERIFY(entry->hasFocus());
|
||||
panel.hide();
|
||||
shown.window.activateWindow();
|
||||
QVERIFY(QTest::qWaitForWindowActive(&shown.window));
|
||||
QTRY_VERIFY(shown.canvas->hasFocus());
|
||||
shown.session.cancelText();
|
||||
shown.canvas->consumeFocusRequest(10);
|
||||
QTRY_VERIFY(shown.canvas->hasFocus());
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "EyedropperFixtures.h"
|
||||
#include <QLineEdit>
|
||||
|
||||
// Picking beside tools, the open picker and lost releases.
|
||||
class PickingTests : public QObject {
|
||||
@@ -13,6 +14,7 @@ private slots:
|
||||
void aLostReleaseEndsTheSampling();
|
||||
void theInlineEditorStandsAsideForThePicker();
|
||||
void aPolygonalLassoWaitsForThePicker();
|
||||
void openTextTakesTheKeysBackFromThePicker();
|
||||
};
|
||||
|
||||
void PickingTests::altPicksUnderTheBrushSpotHealingAndTheGradient()
|
||||
@@ -275,5 +277,71 @@ void PickingTests::aPolygonalLassoWaitsForThePicker()
|
||||
shown.session.closeColorPicker(false);
|
||||
}
|
||||
|
||||
void PickingTests::openTextTakesTheKeysBackFromThePicker()
|
||||
{
|
||||
// Swift's 810c88a: closing either picker returns the keys to text.
|
||||
Picking shown;
|
||||
QObject::connect(&shown.session, &EditorSession::changed, shown.canvas, [&shown] {
|
||||
shown.canvas->consumeFocusRequest(shown.session.canvasFocusRequest());
|
||||
shown.canvas->synchronizeDisplay();
|
||||
});
|
||||
auto *field = new QLineEdit(&shown.window);
|
||||
field->setGeometry(0, 0, 10, 10);
|
||||
field->show();
|
||||
shown.tool(NavigationTool::type);
|
||||
QString typed;
|
||||
for (const bool existing : {false, true}) {
|
||||
if (existing) {
|
||||
QVERIFY(shown.session.finishText());
|
||||
shown.session.editActiveText();
|
||||
QVERIFY(shown.session.textDraft().value().layerID.has_value());
|
||||
} else {
|
||||
beginTextAt(shown.session, QPointF(20, 30));
|
||||
}
|
||||
// The foreground, the background, the Type bar's.
|
||||
for (const int picker : {0, 1, 2}) {
|
||||
for (const bool commit : {false, true}) {
|
||||
picker == 2 ? shown.session.openTextColorPicker() : shown.session.openColorPicker(picker == 1);
|
||||
QVERIFY(shown.session.colorPicker().has_value());
|
||||
field->setFocus();
|
||||
QTRY_VERIFY(field->hasFocus());
|
||||
const int requests = shown.session.canvasFocusRequest();
|
||||
shown.session.closeColorPicker(commit);
|
||||
QCOMPARE(shown.session.canvasFocusRequest(), requests + 1);
|
||||
QTRY_VERIFY(shown.canvas->hasFocus());
|
||||
QTest::keyClicks(shown.canvas, QStringLiteral("a"));
|
||||
typed += u'a';
|
||||
}
|
||||
}
|
||||
QCOMPARE(shown.session.textDraft().value().style.content, typed);
|
||||
}
|
||||
// Ctrl+Return reaches the text: it applies.
|
||||
QTest::keyClick(shown.canvas, Qt::Key_Return, Qt::ControlModifier);
|
||||
QVERIFY(!shown.session.textDraft());
|
||||
QCOMPARE(shown.session.activeLayer().value().liveText().value().style.content, QString(12, u'a'));
|
||||
// Any focus request hands open text the keys.
|
||||
shown.session.editActiveText();
|
||||
field->setFocus();
|
||||
QTRY_VERIFY(field->hasFocus());
|
||||
shown.session.requestCanvasFocus();
|
||||
QTRY_VERIFY(shown.canvas->hasFocus());
|
||||
// No open text: a closed picker asks nothing, field kept.
|
||||
QVERIFY(shown.session.finishText());
|
||||
QTRY_VERIFY(shown.canvas->hasFocus());
|
||||
for (const int picker : {0, 1, 2}) {
|
||||
for (const bool commit : {false, true}) {
|
||||
field->setFocus();
|
||||
QTRY_VERIFY(field->hasFocus());
|
||||
const int requests = shown.session.canvasFocusRequest();
|
||||
picker == 2 ? shown.session.openTextColorPicker() : shown.session.openColorPicker(picker == 1);
|
||||
QVERIFY(shown.session.colorPicker().has_value());
|
||||
shown.session.closeColorPicker(commit);
|
||||
QCOMPARE(shown.session.canvasFocusRequest(), requests);
|
||||
QTest::qWait(20);
|
||||
QVERIFY(field->hasFocus());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QTEST_MAIN(PickingTests)
|
||||
#include "PickingTests.moc"
|
||||
@@ -172,6 +172,7 @@ compositor_test(SheetTeardownTests)
|
||||
compositor_test(TextColorRunsTests)
|
||||
compositor_test(TextColorModelTests)
|
||||
compositor_test(TextColorEditorTests)
|
||||
compositor_test(TextEditingGatesTests)
|
||||
compositor_test(RecentProjectsCoreTests)
|
||||
compositor_test(ProjectWorkspaceSignalTests)
|
||||
compositor_test(ProjectWorkspaceTests)
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
#include "MenuFixtures.h"
|
||||
#include "Document/BrushStroke.h"
|
||||
#include "SelectionFixtures.h"
|
||||
|
||||
// Swift's d448625: filters, adjustments and Invert wait for open text.
|
||||
class TextEditingGatesTests : public QObject {
|
||||
Q_OBJECT
|
||||
private slots:
|
||||
void colourEditsWaitForOpenText();
|
||||
void existingTextAndAnEmptyLayerWaitToo();
|
||||
};
|
||||
|
||||
void TextEditingGatesTests::colourEditsWaitForOpenText()
|
||||
{
|
||||
Bar bar;
|
||||
EditorSession &session = bar.session();
|
||||
session.createDocument(40, 30);
|
||||
QImage image = BrushRaster::context(40, 30, false);
|
||||
image.fill(QColor(120, 160, 200));
|
||||
session.insert(ImportedImage(image, image, QStringLiteral("Colour")));
|
||||
const QStringList entries{"levels", "curves", "hueSaturation", "invert", "gaussianBlur", "vignette", "exposure"};
|
||||
const auto enabled = [&] {
|
||||
QStringList on;
|
||||
for (const QString &name : entries) {
|
||||
if (bar.action(qPrintable(name)).isEnabled())
|
||||
on << name;
|
||||
}
|
||||
return on;
|
||||
};
|
||||
QVERIFY(session.canAdjustColors() && session.canInvert() && session.canVignette());
|
||||
QCOMPARE(enabled(), entries);
|
||||
// Open text is drawn by its editor: colour edits wait.
|
||||
session.selectTool(NavigationTool::type);
|
||||
session.beginText(QPointF(5, 5));
|
||||
QVERIFY(session.textDraft());
|
||||
QVERIFY(!session.canAdjustColors() && !session.canInvert() && !session.canVignette());
|
||||
QCOMPARE(enabled(), QStringList());
|
||||
session.beginLevels();
|
||||
session.beginFilter(FilterKind::gaussianBlur);
|
||||
session.invertPixels();
|
||||
QVERIFY(!session.levels() && !session.filterEdit());
|
||||
// Closed, the text lets them go on.
|
||||
session.cancelText();
|
||||
QVERIFY(session.canAdjustColors() && session.canInvert() && session.canVignette());
|
||||
QCOMPARE(enabled(), entries);
|
||||
}
|
||||
|
||||
void TextEditingGatesTests::existingTextAndAnEmptyLayerWaitToo()
|
||||
{
|
||||
Bar bar;
|
||||
EditorSession &session = bar.session();
|
||||
session.createDocument(200, 100);
|
||||
session.selectTool(NavigationTool::type);
|
||||
session.beginText(QPointF(10, 10));
|
||||
TextDraft draft = session.textDraft().value();
|
||||
draft.style.content = QStringLiteral("Words");
|
||||
session.setTextDraft(draft);
|
||||
QVERIFY(session.finishText());
|
||||
session.applySelection(rectPath(QRectF(0, 0, 50, 50)), SelectionMode::replace, "Select");
|
||||
const QStringList entries{"levels", "hueSaturation", "invert", "gaussianBlur", "cameraRawFilter", "contentAwareFill"};
|
||||
const auto enabled = [&] {
|
||||
QStringList on;
|
||||
for (const QString &name : entries) {
|
||||
if (bar.action(qPrintable(name)).isEnabled())
|
||||
on << name;
|
||||
}
|
||||
return on;
|
||||
};
|
||||
QCOMPARE(enabled(), entries);
|
||||
QVERIFY(session.canContentAwareFill());
|
||||
// Reopened, the layer's text is its editor's: every edit waits.
|
||||
session.editActiveText();
|
||||
QVERIFY(session.textDraft().value().layerID.has_value());
|
||||
QVERIFY(!session.canAdjustColors() && !session.canInvert() && !session.canContentAwareFill());
|
||||
QCOMPARE(enabled(), QStringList());
|
||||
const QImage pixels = session.activeLayer().value().asset.value().image();
|
||||
const int steps = session.history.undoCount();
|
||||
session.beginHueSaturation();
|
||||
session.beginFilter(FilterKind::cameraRaw);
|
||||
bool inverted = false;
|
||||
session.invertPixels([&inverted] { inverted = true; });
|
||||
QTRY_VERIFY(inverted);
|
||||
QVERIFY(!session.hueSaturation() && !session.filterEdit());
|
||||
QCOMPARE(session.history.undoCount(), steps);
|
||||
QCOMPARE(session.activeLayer().value().asset.value().image(), pixels);
|
||||
QCOMPARE(session.textDraft().value().style.content, QString("Words"));
|
||||
QVERIFY(session.finishText());
|
||||
QCOMPARE(enabled(), entries);
|
||||
// Vignette paints an empty layer, but not under new text.
|
||||
session.deselect();
|
||||
session.addBlankLayer();
|
||||
QVERIFY(!session.activeLayer().value().asset && session.canVignette());
|
||||
session.beginText(QPointF(120, 60), true);
|
||||
QVERIFY(!session.textDraft().value().layerID && !session.activeLayer().value().asset);
|
||||
QVERIFY(!session.canVignette() && !bar.action("vignette").isEnabled());
|
||||
session.cancelText();
|
||||
QVERIFY(session.canVignette() && bar.action("vignette").isEnabled());
|
||||
}
|
||||
|
||||
QTEST_MAIN(TextEditingGatesTests)
|
||||
#include "TextEditingGatesTests.moc"
|
||||
Reference in new issue
Block a user