m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clicking on the current forecolor in palette will open the palette window.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@793 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2009-05-08 20:52:48 +00:00
parent 29bfd973d3
commit 4a051bb820
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buttons.c
View File

@ -38,6 +38,7 @@
#include "buttons.h" #include "buttons.h"
#include "operatio.h" #include "operatio.h"
#include "pages.h" #include "pages.h"
#include "palette.h"
#include "errors.h" #include "errors.h"
#include "readini.h" #include "readini.h"
#include "saveini.h" #include "saveini.h"
@ -275,7 +276,12 @@ void Button_Select_forecolor(void)
{ {
int color=Pick_color_in_palette(); int color=Pick_color_in_palette();
if (color!=-1) if (color == Fore_color)
{
// Open palette window
Button_Palette();
}
else if (color!=-1)
{ {
Hide_cursor(); Hide_cursor();
Frame_menu_color(MC_Black); Frame_menu_color(MC_Black);

40
const.h
View File

@ -144,17 +144,17 @@ enum ERROR_CODES
ERROR_SORRY_SORRY_SORRY ///< (Page allocation error that shouldn't ever happen, now) ERROR_SORRY_SORRY_SORRY ///< (Page allocation error that shouldn't ever happen, now)
}; };
// Available pixel scalers /// Available pixel scalers
enum PIXEL_RATIO enum PIXEL_RATIO
{ {
PIXEL_SIMPLE=0, PIXEL_SIMPLE=0, ///< Use real pixels
PIXEL_WIDE, PIXEL_WIDE, ///< Use wide pixels (2x1) like on Amstrad CPC mode 0
PIXEL_TALL, PIXEL_TALL, ///< Use tall pixels (1x2) like on Amstrad CPC mode 2
PIXEL_DOUBLE, PIXEL_DOUBLE, ///< Use big pixels (2x2) if your LCD screen can't do lowres by itself
PIXEL_TRIPLE, PIXEL_TRIPLE, ///< Use really big pixels (3x3)
PIXEL_WIDE2, PIXEL_WIDE2, ///< Use big wide pixels (4x2)
PIXEL_TALL2, PIXEL_TALL2, ///< Use big tall pixels (2x4)
PIXEL_QUAD, PIXEL_QUAD, ///< Use really giant pixels (4x4). You need to have a screen resolution at least 1280x800 to use this one
PIXEL_MAX ///< Number of elements in enum PIXEL_MAX ///< Number of elements in enum
}; };
@ -168,7 +168,7 @@ enum FAMILY_OF_BUTTONS
FAMILY_EFFECTS ///< Effects FAMILY_EFFECTS ///< Effects
}; };
// The different kinds of buttons in menus or windows. /// The different kinds of buttons in menus or windows.
enum BUTTON_SHAPES enum BUTTON_SHAPES
{ {
BUTTON_SHAPE_NO_FRAME, ///< Ex: the palette BUTTON_SHAPE_NO_FRAME, ///< Ex: the palette
@ -230,20 +230,20 @@ enum SHADE_MODES
/// Identifiers for the chunks (data blocks) of gfx2.cfg /// Identifiers for the chunks (data blocks) of gfx2.cfg
enum CHUNKS_CFG enum CHUNKS_CFG
{ {
CHUNK_KEYS = 0, CHUNK_KEYS = 0, ///< Shortcut keys definitions
CHUNK_VIDEO_MODES = 1, CHUNK_VIDEO_MODES = 1, ///< List of video modes
CHUNK_SHADE = 2, CHUNK_SHADE = 2, ///< Shade settings
CHUNK_MASK = 3, CHUNK_MASK = 3, ///< Mask settings
CHUNK_STENCIL = 4, CHUNK_STENCIL = 4, ///< Stencil settings
CHUNK_GRADIENTS = 5, CHUNK_GRADIENTS = 5, ///< Gradients
CHUNK_SMOOTH = 6, CHUNK_SMOOTH = 6, ///< Smooth effect settings
CHUNK_EXCLUDE_COLORS = 7, CHUNK_EXCLUDE_COLORS = 7, ///< List of excluded colors
CHUNK_QUICK_SHADE = 8, CHUNK_QUICK_SHADE = 8, ///< QShade effect settings
CHUNK_GRID = 9, CHUNK_GRID = 9,
CHUNK_MAX CHUNK_MAX
}; };
/// Identifiers for the 8x8 icons of ::GFX_icon_sprite /// Identifiers for the 8x8 icons of ::GFX_icon_sprite (these are unused now)
enum ICON_TYPES enum ICON_TYPES
{ {
ICON_FLOPPY_3_5=0, ///< 3½" Floppy disk ICON_FLOPPY_3_5=0, ///< 3½" Floppy disk