mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-02 04:20:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable Fill/Stroke commands when !ENABLE_UI

Browse Source
This commit is contained in:
David Capello 2021-09-23 09:18:14 -03:00
parent 9fe3e40c6a
commit 515952cf32
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/CMakeLists.txt
View File

@ -221,7 +221,6 @@ if(ENABLE_UI)
commands/cmd_duplicate_view.cpp commands/cmd_duplicate_view.cpp
commands/cmd_exit.cpp commands/cmd_exit.cpp
commands/cmd_eyedropper.cpp commands/cmd_eyedropper.cpp
commands/cmd_fill_and_stroke.cpp
commands/cmd_fit_screen.cpp commands/cmd_fit_screen.cpp
commands/cmd_frame_properties.cpp commands/cmd_frame_properties.cpp
commands/cmd_frame_tag_properties.cpp commands/cmd_frame_tag_properties.cpp
@ -501,6 +500,7 @@ add_library(app-lib
commands/cmd_color_quantization.cpp commands/cmd_color_quantization.cpp
commands/cmd_crop.cpp commands/cmd_crop.cpp
commands/cmd_export_sprite_sheet.cpp commands/cmd_export_sprite_sheet.cpp
commands/cmd_fill_and_stroke.cpp
commands/cmd_flatten_layers.cpp commands/cmd_flatten_layers.cpp
commands/cmd_flip.cpp commands/cmd_flip.cpp
commands/cmd_import_sprite_sheet.cpp commands/cmd_import_sprite_sheet.cpp

3
src/app/commands/cmd_fill_and_stroke.cpp
View File

@ -1,4 +1,5 @@
// Aseprite // Aseprite
// Copyright (C) 2021 Igara Studio S.A.
// Copyright (C) 2018 David Capello // Copyright (C) 2018 David Capello
// //
// This program is distributed under the terms of // This program is distributed under the terms of
@ -51,10 +52,12 @@ bool FillCommand::onEnabled(Context* ctx)
ContextFlags::ActiveLayerIsImage)) { ContextFlags::ActiveLayerIsImage)) {
return true; return true;
} }
#if ENABLE_UI
else if (current_editor && else if (current_editor &&
current_editor->isMovingPixels()) { current_editor->isMovingPixels()) {
return true; return true;
} }
#endif
else else
return false; return false;
} }

4
src/app/commands/commands_list.h
View File

@ -19,6 +19,7 @@ FOR_EACH_COMMAND(CopyColors)
FOR_EACH_COMMAND(CropSprite) FOR_EACH_COMMAND(CropSprite)
FOR_EACH_COMMAND(Despeckle) FOR_EACH_COMMAND(Despeckle)
FOR_EACH_COMMAND(ExportSpriteSheet) FOR_EACH_COMMAND(ExportSpriteSheet)
FOR_EACH_COMMAND(Fill)
FOR_EACH_COMMAND(FlattenLayers) FOR_EACH_COMMAND(FlattenLayers)
FOR_EACH_COMMAND(Flip) FOR_EACH_COMMAND(Flip)
FOR_EACH_COMMAND(HueSaturation) FOR_EACH_COMMAND(HueSaturation)
@ -41,6 +42,7 @@ FOR_EACH_COMMAND(SaveFile)
FOR_EACH_COMMAND(SaveFileAs) FOR_EACH_COMMAND(SaveFileAs)
FOR_EACH_COMMAND(SaveFileCopyAs) FOR_EACH_COMMAND(SaveFileCopyAs)
FOR_EACH_COMMAND(SpriteSize) FOR_EACH_COMMAND(SpriteSize)
FOR_EACH_COMMAND(Stroke)
FOR_EACH_COMMAND(Undo) FOR_EACH_COMMAND(Undo)
#ifdef ENABLE_UI #ifdef ENABLE_UI
@ -67,7 +69,6 @@ FOR_EACH_COMMAND(DuplicateSprite)
FOR_EACH_COMMAND(DuplicateView) FOR_EACH_COMMAND(DuplicateView)
FOR_EACH_COMMAND(Exit) FOR_EACH_COMMAND(Exit)
FOR_EACH_COMMAND(Eyedropper) FOR_EACH_COMMAND(Eyedropper)
FOR_EACH_COMMAND(Fill)
FOR_EACH_COMMAND(FitScreen) FOR_EACH_COMMAND(FitScreen)
FOR_EACH_COMMAND(FrameProperties) FOR_EACH_COMMAND(FrameProperties)
FOR_EACH_COMMAND(FrameTagProperties) FOR_EACH_COMMAND(FrameTagProperties)
@ -151,7 +152,6 @@ FOR_EACH_COMMAND(ShowSlices)
FOR_EACH_COMMAND(SliceProperties) FOR_EACH_COMMAND(SliceProperties)
FOR_EACH_COMMAND(SnapToGrid) FOR_EACH_COMMAND(SnapToGrid)
FOR_EACH_COMMAND(SpriteProperties) FOR_EACH_COMMAND(SpriteProperties)
FOR_EACH_COMMAND(Stroke)
FOR_EACH_COMMAND(SwapCheckerboardColors) FOR_EACH_COMMAND(SwapCheckerboardColors)
FOR_EACH_COMMAND(SwitchColors) FOR_EACH_COMMAND(SwitchColors)
FOR_EACH_COMMAND(SymmetryMode) FOR_EACH_COMMAND(SymmetryMode)