The document's own pixel budget, marching ants at screen resolution (12.11a)
This commit is contained in:
1 parent
ffba1753c6
commit
8a9c56ee1f
75 files changed
+759
-189
No files matched your search
@@ -1,4 +1,5 @@
|
||||
#include "UI/CanvasSizeSheet.h"
|
||||
#include "Document/DocumentLimits.h"
|
||||
#include "UI/KeyboardShortcuts.h"
|
||||
#include "UI/ByteCounts.h"
|
||||
#include "UI/ColorPaletteControls.h"
|
||||
@@ -280,7 +281,7 @@ void CanvasSizeSheet::synchronize()
|
||||
const qint64 width = qint64(std::round(m_draft.width)), height = qint64(std::round(m_draft.height));
|
||||
m_note->setText(QStringLiteral("New: %1 × %2 pixels · %3 uncompressed").arg(grouped(width), grouped(height), ByteCounts::memory(width * height * 4)));
|
||||
} else {
|
||||
m_note->setText(QStringLiteral("Final dimensions must be 1–30,000 pixels per side."));
|
||||
m_note->setText(QStringLiteral("Final dimensions must be 1–%1 pixels per side.").arg(DocumentLimits::maxSideText()));
|
||||
}
|
||||
m_note->setForegroundRole(valid ? QPalette::PlaceholderText : QPalette::BrightText);
|
||||
for (QAbstractButton *each : m_anchors->buttons()) {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "UI/ImageSizeSheet.h"
|
||||
#include "Document/DocumentLimits.h"
|
||||
#include "UI/KeyboardShortcuts.h"
|
||||
#include "UI/ColorPickerSheet.h"
|
||||
#include <QCheckBox>
|
||||
@@ -163,8 +164,8 @@ ImageSizeSheet::ImageSizeSheet(const CanvasDocument &document, std::function<voi
|
||||
bool ImageSizeSheet::valid() const
|
||||
{
|
||||
const double width = std::round(m_width), height = std::round(m_height);
|
||||
return m_resolution >= 1 && m_resolution <= 9600 && width >= 1 && width <= 30'000 && height >= 1 && height <= 30'000
|
||||
&& (!m_resample || width * height <= 100'000'000);
|
||||
return m_resolution >= 1 && m_resolution <= 9600 && width >= 1 && width <= DocumentLimits::maxSide && height >= 1 && height <= DocumentLimits::maxSide
|
||||
&& (!m_resample || width * height <= DocumentLimits::maxSurfacePixels);
|
||||
}
|
||||
|
||||
double ImageSizeSheet::display(double pixels, qint64 original) const
|
||||
@@ -267,7 +268,7 @@ void ImageSizeSheet::synchronize()
|
||||
: QStringLiteral("Only print dimensions and resolution change. Pixels stay unchanged."));
|
||||
const bool isValid = valid();
|
||||
m_result->setText(isValid ? QStringLiteral("Result: %1 × %2 pixels").arg(grouped(qint64(std::round(m_width))), grouped(qint64(std::round(m_height))))
|
||||
: QStringLiteral("Use 1–30,000 pixels per side, up to 100 megapixels, and 1–9,600 pixels/inch."));
|
||||
: QStringLiteral("Use 1–%1 pixels per side, up to %2 megapixels, and 1–9,600 pixels/inch.").arg(DocumentLimits::maxSideText()).arg(DocumentLimits::maxSurfaceMegapixels()));
|
||||
m_result->setForegroundRole(isValid ? QPalette::PlaceholderText : QPalette::BrightText);
|
||||
m_resize->setEnabled(isValid);
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "UI/NewCanvasSheet.h"
|
||||
#include "Document/DocumentLimits.h"
|
||||
#include "UI/KeyboardShortcuts.h"
|
||||
#include <QApplication>
|
||||
#include <QBuffer>
|
||||
@@ -99,7 +100,7 @@ void NewCanvasSheet::synchronize()
|
||||
void NewCanvasSheet::validate()
|
||||
{
|
||||
const bool valid = CanvasDocument::validDimension(m_width->text()) && CanvasDocument::validDimension(m_height->text());
|
||||
m_note->setText(valid ? QStringLiteral("Transparent canvas · sRGB") : QStringLiteral("Enter whole numbers from 1 to 30,000 pixels."));
|
||||
m_note->setText(valid ? QStringLiteral("Transparent canvas · sRGB") : QStringLiteral("Enter whole numbers from 1 to %1 pixels.").arg(DocumentLimits::maxSideText()));
|
||||
// The palette's bright text is the theme's warning colour.
|
||||
m_note->setForegroundRole(valid ? QPalette::PlaceholderText : QPalette::BrightText);
|
||||
m_create->setEnabled(valid);
|
||||
|
||||
Reference in new issue
Block a user