mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-27 03:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove background color as an option in "New File"

Browse Source
This commit is contained in:
David Capello 2015-05-09 12:46:07 -03:00
parent 352eff2fd6
commit 06d1929729
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/widgets/new_sprite.xml
View File

@ -1,5 +1,5 @@
<!-- ASEPRITE --> <!-- ASEPRITE -->
<!-- Copyright (C) 2001-2013 by David Capello --> <!-- Copyright (C) 2001-2013, 2015 by David Capello -->
<gui> <gui>
<window text="New Sprite" id="new_sprite"> <window text="New Sprite" id="new_sprite">
<box vertical="true"> <box vertical="true">
@ -30,7 +30,6 @@
<listitem text="Black" /> <listitem text="Black" />
<listitem text="White" /> <listitem text="White" />
<listitem text="Magenta" /> <listitem text="Magenta" />
<listitem text="Background Color" />
</listbox> </listbox>
</view> </view>

12
src/app/commands/cmd_new_file.cpp
View File

@ -20,7 +20,6 @@
#include "app/load_widget.h" #include "app/load_widget.h"
#include "app/modules/editors.h" #include "app/modules/editors.h"
#include "app/modules/palettes.h" #include "app/modules/palettes.h"
#include "app/ui/color_bar.h"
#include "app/ui/workspace.h" #include "app/ui/workspace.h"
#include "app/ui_context.h" #include "app/ui_context.h"
#include "app/util/clipboard.h" #include "app/util/clipboard.h"
@ -69,8 +68,7 @@ void NewFileCommand::onExecute(Context* context)
app::Color::fromMask(), app::Color::fromMask(),
app::Color::fromRgb(0, 0, 0), app::Color::fromRgb(0, 0, 0),
app::Color::fromRgb(255, 255, 255), app::Color::fromRgb(255, 255, 255),
app::Color::fromRgb(255, 0, 255), app::Color::fromRgb(255, 0, 255)
ColorBar::instance()->getBgColor()
}; };
// Load the window widget // Load the window widget
@ -84,9 +82,13 @@ void NewFileCommand::onExecute(Context* context)
} }
w = get_config_int("NewSprite", "Width", 320); w = get_config_int("NewSprite", "Width", 320);
h = get_config_int("NewSprite", "Height", 240); h = get_config_int("NewSprite", "Height", 240);
bg = get_config_int("NewSprite", "Background", 4); // Default = Background color bg = get_config_int("NewSprite", "Background", 1); // Default = Black
// ncolors = get_config_int("NewSprite", "Colors", 256); // ncolors = get_config_int("NewSprite", "Colors", 256);
if (bg == 4) // Convert old default (Background color) to new default (Black)
bg = 1;
bg = MID(0, bg, 3);
// If the clipboard contains an image, we can show the size of the // If the clipboard contains an image, we can show the size of the
// clipboard as default image size. // clipboard as default image size.
gfx::Size clipboardSize; gfx::Size clipboardSize;
@ -135,7 +137,7 @@ void NewFileCommand::onExecute(Context* context)
// Select the color // Select the color
app::Color color = app::Color::fromMask(); app::Color color = app::Color::fromMask();
if (bg >= 0 && bg <= 4) { if (bg >= 0 && bg <= 3) {
color = bg_table[bg]; color = bg_table[bg];
ok = true; ok = true;
} }