mirror of
https://github.com/aseprite/aseprite.git
synced 2025-04-25 03:02:31 +00:00
Rename ui::Entry::EntryChange to ui::Entry::Change
This commit is contained in:
parent
3dfd6de4f0
commit
a06e01ff7e
@ -61,13 +61,13 @@ public:
|
|||||||
setTop(0);
|
setTop(0);
|
||||||
setBottom(0);
|
setBottom(0);
|
||||||
|
|
||||||
width() ->EntryChange.connect(Bind<void>(&CanvasSizeWindow::onSizeChange, this));
|
width() ->Change.connect(Bind<void>(&CanvasSizeWindow::onSizeChange, this));
|
||||||
height()->EntryChange.connect(Bind<void>(&CanvasSizeWindow::onSizeChange, this));
|
height()->Change.connect(Bind<void>(&CanvasSizeWindow::onSizeChange, this));
|
||||||
dir() ->ItemChange.connect(Bind<void>(&CanvasSizeWindow::onDirChange, this));;
|
dir() ->ItemChange.connect(Bind<void>(&CanvasSizeWindow::onDirChange, this));;
|
||||||
left() ->EntryChange.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
left() ->Change.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
||||||
right() ->EntryChange.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
right() ->Change.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
||||||
top() ->EntryChange.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
top() ->Change.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
||||||
bottom()->EntryChange.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
bottom()->Change.connect(Bind<void>(&CanvasSizeWindow::onBorderChange, this));
|
||||||
|
|
||||||
m_editor->setState(m_selectBoxState);
|
m_editor->setState(m_selectBoxState);
|
||||||
|
|
||||||
|
@ -355,13 +355,13 @@ public:
|
|||||||
|
|
||||||
exportButton()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onExport, this));
|
exportButton()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onExport, this));
|
||||||
sheetType()->Change.connect(&ExportSpriteSheetWindow::onSheetTypeChange, this);
|
sheetType()->Change.connect(&ExportSpriteSheetWindow::onSheetTypeChange, this);
|
||||||
columns()->EntryChange.connect(Bind<void>(&ExportSpriteSheetWindow::onColumnsChange, this));
|
columns()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onColumnsChange, this));
|
||||||
fitWidth()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onSizeChange, this));
|
fitWidth()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onSizeChange, this));
|
||||||
fitHeight()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onSizeChange, this));
|
fitHeight()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onSizeChange, this));
|
||||||
bestFit()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onBestFit, this));
|
bestFit()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onBestFit, this));
|
||||||
borderPadding()->EntryChange.connect(Bind<void>(&ExportSpriteSheetWindow::onPaddingChange, this));
|
borderPadding()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onPaddingChange, this));
|
||||||
shapePadding()->EntryChange.connect(Bind<void>(&ExportSpriteSheetWindow::onPaddingChange, this));
|
shapePadding()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onPaddingChange, this));
|
||||||
innerPadding()->EntryChange.connect(Bind<void>(&ExportSpriteSheetWindow::onPaddingChange, this));
|
innerPadding()->Change.connect(Bind<void>(&ExportSpriteSheetWindow::onPaddingChange, this));
|
||||||
imageFilename()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onImageFilename, this));
|
imageFilename()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onImageFilename, this));
|
||||||
dataEnabled()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onDataEnabledChange, this));
|
dataEnabled()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onDataEnabledChange, this));
|
||||||
dataFilename()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onDataFilename, this));
|
dataFilename()->Click.connect(Bind<void>(&ExportSpriteSheetWindow::onDataFilename, this));
|
||||||
|
@ -54,10 +54,10 @@ public:
|
|||||||
, m_docPref(nullptr) {
|
, m_docPref(nullptr) {
|
||||||
import()->setEnabled(false);
|
import()->setEnabled(false);
|
||||||
|
|
||||||
x()->EntryChange.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
x()->Change.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
||||||
y()->EntryChange.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
y()->Change.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
||||||
width()->EntryChange.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
width()->Change.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
||||||
height()->EntryChange.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
height()->Change.connect(Bind<void>(&ImportSpriteSheetWindow::onEntriesChange, this));
|
||||||
selectFile()->Click.connect(Bind<void>(&ImportSpriteSheetWindow::onSelectFile, this));
|
selectFile()->Click.connect(Bind<void>(&ImportSpriteSheetWindow::onSelectFile, this));
|
||||||
|
|
||||||
remapWindow();
|
remapWindow();
|
||||||
|
@ -75,7 +75,7 @@ public:
|
|||||||
mode()->addItem("Color");
|
mode()->addItem("Color");
|
||||||
mode()->addItem("Luminosity");
|
mode()->addItem("Luminosity");
|
||||||
|
|
||||||
name()->EntryChange.connect(Bind<void>(&LayerPropertiesWindow::onStartTimer, this));
|
name()->Change.connect(Bind<void>(&LayerPropertiesWindow::onStartTimer, this));
|
||||||
mode()->Change.connect(Bind<void>(&LayerPropertiesWindow::onStartTimer, this));
|
mode()->Change.connect(Bind<void>(&LayerPropertiesWindow::onStartTimer, this));
|
||||||
opacity()->Change.connect(Bind<void>(&LayerPropertiesWindow::onStartTimer, this));
|
opacity()->Change.connect(Bind<void>(&LayerPropertiesWindow::onStartTimer, this));
|
||||||
m_timer.Tick.connect(Bind<void>(&LayerPropertiesWindow::onCommitChange, this));
|
m_timer.Tick.connect(Bind<void>(&LayerPropertiesWindow::onCommitChange, this));
|
||||||
|
@ -232,10 +232,10 @@ void SpriteSizeCommand::onExecute(Context* context)
|
|||||||
m_heightPx->setTextf("%d", new_height);
|
m_heightPx->setTextf("%d", new_height);
|
||||||
|
|
||||||
m_lockRatio->Click.connect(Bind<void>(&SpriteSizeCommand::onLockRatioClick, this));
|
m_lockRatio->Click.connect(Bind<void>(&SpriteSizeCommand::onLockRatioClick, this));
|
||||||
m_widthPx->EntryChange.connect(Bind<void>(&SpriteSizeCommand::onWidthPxChange, this));
|
m_widthPx->Change.connect(Bind<void>(&SpriteSizeCommand::onWidthPxChange, this));
|
||||||
m_heightPx->EntryChange.connect(Bind<void>(&SpriteSizeCommand::onHeightPxChange, this));
|
m_heightPx->Change.connect(Bind<void>(&SpriteSizeCommand::onHeightPxChange, this));
|
||||||
m_widthPerc->EntryChange.connect(Bind<void>(&SpriteSizeCommand::onWidthPercChange, this));
|
m_widthPerc->Change.connect(Bind<void>(&SpriteSizeCommand::onWidthPercChange, this));
|
||||||
m_heightPerc->EntryChange.connect(Bind<void>(&SpriteSizeCommand::onHeightPercChange, this));
|
m_heightPerc->Change.connect(Bind<void>(&SpriteSizeCommand::onHeightPercChange, this));
|
||||||
|
|
||||||
method->addItem("Nearest-neighbor");
|
method->addItem("Nearest-neighbor");
|
||||||
method->addItem("Bilinear");
|
method->addItem("Bilinear");
|
||||||
|
@ -54,8 +54,8 @@ public:
|
|||||||
m_widthEntry->setTextf("%d", m_filter.getWidth());
|
m_widthEntry->setTextf("%d", m_filter.getWidth());
|
||||||
m_heightEntry->setTextf("%d", m_filter.getHeight());
|
m_heightEntry->setTextf("%d", m_filter.getHeight());
|
||||||
|
|
||||||
m_widthEntry->EntryChange.connect(&DespeckleWindow::onSizeChange, this);
|
m_widthEntry->Change.connect(&DespeckleWindow::onSizeChange, this);
|
||||||
m_heightEntry->EntryChange.connect(&DespeckleWindow::onSizeChange, this);
|
m_heightEntry->Change.connect(&DespeckleWindow::onSizeChange, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -148,7 +148,7 @@ void ColorSliders::addSlider(Channel channel, const char* labelText, int min, in
|
|||||||
|
|
||||||
absSlider->Change.connect(Bind<void>(&ColorSliders::onSliderChange, this, m_absSlider.size()-1));
|
absSlider->Change.connect(Bind<void>(&ColorSliders::onSliderChange, this, m_absSlider.size()-1));
|
||||||
relSlider->Change.connect(Bind<void>(&ColorSliders::onSliderChange, this, m_relSlider.size()-1));
|
relSlider->Change.connect(Bind<void>(&ColorSliders::onSliderChange, this, m_relSlider.size()-1));
|
||||||
entry->EntryChange.connect(Bind<void>(&ColorSliders::onEntryChange, this, m_entry.size()-1));
|
entry->Change.connect(Bind<void>(&ColorSliders::onEntryChange, this, m_entry.size()-1));
|
||||||
|
|
||||||
HBox* box = new HBox();
|
HBox* box = new HBox();
|
||||||
box->addChild(absSlider);
|
box->addChild(absSlider);
|
||||||
|
@ -101,7 +101,7 @@ public:
|
|||||||
CustomFileNameEntry()
|
CustomFileNameEntry()
|
||||||
: m_fileList(nullptr) {
|
: m_fileList(nullptr) {
|
||||||
setEditable(true);
|
setEditable(true);
|
||||||
getEntryWidget()->EntryChange.connect(&CustomFileNameEntry::onEntryChange, this);
|
getEntryWidget()->Change.connect(&CustomFileNameEntry::onEntryChange, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setAssociatedFileList(FileList* fileList) {
|
void setAssociatedFileList(FileList* fileList) {
|
||||||
|
@ -35,7 +35,7 @@ HexColorEntry::HexColorEntry()
|
|||||||
addChild(&m_label);
|
addChild(&m_label);
|
||||||
addChild(&m_entry);
|
addChild(&m_entry);
|
||||||
|
|
||||||
m_entry.EntryChange.connect(&HexColorEntry::onEntryChange, this);
|
m_entry.Change.connect(&HexColorEntry::onEntryChange, this);
|
||||||
|
|
||||||
initTheme();
|
initTheme();
|
||||||
|
|
||||||
|
@ -449,9 +449,9 @@ void Entry::onSetText()
|
|||||||
m_caret = (int)getTextLength();
|
m_caret = (int)getTextLength();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Entry::onEntryChange()
|
void Entry::onChange()
|
||||||
{
|
{
|
||||||
EntryChange();
|
Change();
|
||||||
}
|
}
|
||||||
|
|
||||||
int Entry::getCaretFromMouse(MouseMessage* mousemsg)
|
int Entry::getCaretFromMouse(MouseMessage* mousemsg)
|
||||||
@ -682,7 +682,7 @@ void Entry::executeCmd(EntryCmd cmd, int unicodeChar, bool shift_pressed)
|
|||||||
std::string newText = base::to_utf8(text);
|
std::string newText = base::to_utf8(text);
|
||||||
if (newText != getText()) {
|
if (newText != getText()) {
|
||||||
setText(newText.c_str());
|
setText(newText.c_str());
|
||||||
onEntryChange();
|
onChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
setCaretPos(m_caret);
|
setCaretPos(m_caret);
|
||||||
|
@ -42,7 +42,7 @@ namespace ui {
|
|||||||
int* selbeg, int* selend);
|
int* selbeg, int* selend);
|
||||||
|
|
||||||
// Signals
|
// Signals
|
||||||
Signal0<void> EntryChange;
|
Signal0<void> Change;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// Events
|
// Events
|
||||||
@ -52,7 +52,7 @@ namespace ui {
|
|||||||
void onSetText() override;
|
void onSetText() override;
|
||||||
|
|
||||||
// New Events
|
// New Events
|
||||||
virtual void onEntryChange();
|
virtual void onChange();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum class EntryCmd {
|
enum class EntryCmd {
|
||||||
|
@ -140,9 +140,9 @@ void IntEntry::onPreferredSize(PreferredSizeEvent& ev)
|
|||||||
ev.setPreferredSize(w, h);
|
ev.setPreferredSize(w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IntEntry::onEntryChange()
|
void IntEntry::onChange()
|
||||||
{
|
{
|
||||||
Entry::onEntryChange();
|
Entry::onChange();
|
||||||
onValueChange();
|
onValueChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ namespace ui {
|
|||||||
protected:
|
protected:
|
||||||
bool onProcessMessage(Message* msg) override;
|
bool onProcessMessage(Message* msg) override;
|
||||||
void onPreferredSize(PreferredSizeEvent& ev) override;
|
void onPreferredSize(PreferredSizeEvent& ev) override;
|
||||||
void onEntryChange() override;
|
void onChange() override;
|
||||||
|
|
||||||
// New events
|
// New events
|
||||||
virtual void onValueChange();
|
virtual void onValueChange();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user