Crop ratios and selection start, Vignette on empty layers, text colour previews (12.10c); mutation runs use 12 cores
This commit is contained in:
1 parent
7a873eb9c7
commit
ffba1753c6
27 files changed
+555
-55
No files matched your search
@@ -366,7 +366,7 @@ void CompositorMenus::synchronize()
|
||||
action(QStringLiteral("levels"))->setEnabled(s.canAdjustColors() && !s.hueSaturation());
|
||||
for (const FilterKind kind : allFilterKinds) {
|
||||
if (kind != FilterKind::contentAwareFill)
|
||||
action(filterName(kind))->setEnabled(s.canAdjustColors() && !s.hueSaturation());
|
||||
action(filterName(kind))->setEnabled((kind == FilterKind::vignette ? s.canVignette() : s.canAdjustColors()) && !s.hueSaturation());
|
||||
}
|
||||
action(QStringLiteral("hueSaturation"))->setEnabled(s.canAdjustColors());
|
||||
action(QStringLiteral("invert"))->setText(s.isMaskSelected() ? QStringLiteral("Invert Mask") : QStringLiteral("Invert"));
|
||||
|
||||
@@ -19,7 +19,8 @@ CropControls::CropControls(EditorSession &session, QWidget *parent)
|
||||
pickerRow->addWidget(label);
|
||||
pickerRow->addWidget(m_ratio, 1);
|
||||
m_ratio->setObjectName(QStringLiteral("cropRatio"));
|
||||
for (const QString &choice : {QStringLiteral("Free"), QStringLiteral("Original"), QStringLiteral("1:1"), QStringLiteral("4:3"), QStringLiteral("16:9")})
|
||||
for (const QString &choice : {QStringLiteral("Free"), QStringLiteral("Original"), QStringLiteral("1:1"), QStringLiteral("4:3"), QStringLiteral("3:4"), QStringLiteral("16:9"),
|
||||
QStringLiteral("9:16")})
|
||||
m_ratio->addItem(choice);
|
||||
// Swift's onChange: the frame takes a ratio that changed.
|
||||
connect(m_ratio, &QComboBox::activated, this, [this](int index) {
|
||||
|
||||
@@ -272,6 +272,12 @@ QToolButton *TypeControls::alignment(TextAlignment value)
|
||||
|
||||
void TypeControls::synchronize()
|
||||
{
|
||||
// Swift's onChange: open text previews the picker's colour.
|
||||
const std::optional<PaletteColor> picked = m_session.colorPicker() ? std::optional(m_session.colorPicker()->color()) : std::nullopt;
|
||||
if (picked != m_pickerColour) {
|
||||
m_pickerColour = picked;
|
||||
m_session.previewTextColor();
|
||||
}
|
||||
const LayerTextStyle style = m_session.currentTextStyle();
|
||||
m_font->sync(style.fontName);
|
||||
for (size_t index = 0; index < m_alignments.size(); ++index)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
#include "Document/ColorPalette.h"
|
||||
#include "Document/TypeTool.h"
|
||||
#include "UI/ToolHeaderStyle.h"
|
||||
#include <QComboBox>
|
||||
@@ -74,4 +75,5 @@ private:
|
||||
QPushButton *const m_cancel;
|
||||
QPushButton *const m_done;
|
||||
QPushButton *const m_edit;
|
||||
std::optional<PaletteColor> m_pickerColour;
|
||||
};
|
||||
Reference in new issue
Block a user