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

Removed real-time dithering option (because 8 bpp is not supported anymore).

Browse Source
This commit is contained in:
David Capello 2010-03-24 18:06:28 -03:00
parent 9774059a9a
commit 1fe1e2ff7b
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/jids/options.jid
View File

@ -21,7 +21,6 @@
<separator horizontal="true" /> <separator horizontal="true" />
<check text="Smooth auto-scroll" name="smooth" /> <check text="Smooth auto-scroll" name="smooth" />
<check text="Real-time ordered dithering" name="dither" />
<check text="2 Click Movement" name="move_click2" /> <check text="2 Click Movement" name="move_click2" />
<check text="2 Click Drawing" name="draw_click2" /> <check text="2 Click Drawing" name="draw_click2" />

11
src/dialogs/options.cpp
View File

@ -45,7 +45,7 @@ static bool slider_mouse_hook(JWidget widget, void *data);
/* shows option dialog */ /* shows option dialog */
void dialogs_options() void dialogs_options()
{ {
JWidget check_smooth, check_dither; JWidget check_smooth;
JWidget button_ok; JWidget button_ok;
JWidget move_click2, draw_click2, killer; JWidget move_click2, draw_click2, killer;
JWidget undo_size_limit; JWidget undo_size_limit;
@ -65,7 +65,6 @@ void dialogs_options()
"mouse_y", &slider_y, "mouse_y", &slider_y,
"lock_axis", &check_lockmouse, "lock_axis", &check_lockmouse,
"smooth", &check_smooth, "smooth", &check_smooth,
"dither", &check_dither,
"move_click2", &move_click2, "move_click2", &move_click2,
"draw_click2", &draw_click2, "draw_click2", &draw_click2,
"undo_size_limit", &undo_size_limit, "undo_size_limit", &undo_size_limit,
@ -83,9 +82,6 @@ void dialogs_options()
if (get_config_bool("Options", "MoveSmooth", true)) if (get_config_bool("Options", "MoveSmooth", true))
jwidget_select(check_smooth); jwidget_select(check_smooth);
if (get_config_bool("Options", "Dither", false))
jwidget_select(check_dither);
undo_size_limit->setTextf("%d", get_config_int("Options", "UndoSizeLimit", 8)); undo_size_limit->setTextf("%d", get_config_int("Options", "UndoSizeLimit", 8));
HOOK(slider_x, JI_SIGNAL_SLIDER_CHANGE, slider_mouse_hook, NULL); HOOK(slider_x, JI_SIGNAL_SLIDER_CHANGE, slider_mouse_hook, NULL);
@ -101,11 +97,6 @@ void dialogs_options()
set_config_bool("Options", "MoveSmooth", jwidget_is_selected(check_smooth)); set_config_bool("Options", "MoveSmooth", jwidget_is_selected(check_smooth));
set_config_bool("Options", "MoveClick2", jwidget_is_selected(move_click2)); set_config_bool("Options", "MoveClick2", jwidget_is_selected(move_click2));
set_config_bool("Options", "DrawClick2", jwidget_is_selected(draw_click2)); set_config_bool("Options", "DrawClick2", jwidget_is_selected(draw_click2));
if (get_config_bool("Options", "Dither", false) != jwidget_is_selected(check_dither)) {
set_config_bool("Options", "Dither", jwidget_is_selected(check_dither));
refresh_all_editors();
}
undo_size_limit_value = undo_size_limit->getTextInt(); undo_size_limit_value = undo_size_limit->getTextInt();
undo_size_limit_value = MID(1, undo_size_limit_value, 9999); undo_size_limit_value = MID(1, undo_size_limit_value, 9999);

16
src/widgets/editor/editor.cpp
View File

@ -56,8 +56,6 @@
KB_ALT_FLAG | \ KB_ALT_FLAG | \
KB_CTRL_FLAG)) == (shift)) KB_CTRL_FLAG)) == (shift))
static bool use_dither = false;
static bool editor_view_msg_proc(JWidget widget, JMessage msg); static bool editor_view_msg_proc(JWidget widget, JMessage msg);
JWidget editor_view_new() JWidget editor_view_new()
@ -305,18 +303,6 @@ void Editor::editor_draw_sprite(int x1, int y1, int x2, int y2)
m_sprite->frame, m_sprite->frame,
m_zoom); m_zoom);
/* dithering */
if (use_dither &&
rendered &&
rendered->imgtype == IMAGE_RGB &&
bitmap_color_depth(ji_screen) == 8) {
Image *rgb_rendered = rendered;
rendered = image_rgb_to_indexed(rgb_rendered, source_x, source_y,
orig_rgb_map,
get_current_palette());
image_free(rgb_rendered);
}
if (rendered) { if (rendered) {
#ifdef DRAWSPRITE_DOUBLEBUFFERED #ifdef DRAWSPRITE_DOUBLEBUFFERED
BITMAP *bmp = create_bitmap(width, height); BITMAP *bmp = create_bitmap(width, height);
@ -766,8 +752,6 @@ bool Editor::msg_proc(JMessage msg)
else { else {
int x1, y1, x2, y2; int x1, y1, x2, y2;
use_dither = get_config_bool("Options", "Dither", use_dither);
/* draw the background outside of image */ /* draw the background outside of image */
x1 = this->rc->x1 + m_offset_x; x1 = this->rc->x1 + m_offset_x;
y1 = this->rc->y1 + m_offset_y; y1 = this->rc->y1 + m_offset_y;