projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mask tweaks, focus follows centroid, gradient/colorpicker rework, no hard edges in...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
colorpicker.h
diff --git
a/cinelerra-5.1/cinelerra/colorpicker.h
b/cinelerra-5.1/cinelerra/colorpicker.h
index a5d203d29fc47fa31506cb9030e30a6c9eb0b1c4..1fffa252250cd1b4dca24892c45de5cab58b281e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.h
+++ b/
cinelerra-5.1/cinelerra/colorpicker.h
@@
-83,6
+83,7
@@
public:
void update_yuv(float y, float u, float v);
void update_rgb_hex(const char *hex);
int rgb888();
void update_yuv(float y, float u, float v);
void update_rgb_hex(const char *hex);
int rgb888();
+ int alpha8();
ColorPicker *thread;
PaletteWheel *wheel;
ColorPicker *thread;
PaletteWheel *wheel;
@@
-364,6
+365,7
@@
public:
virtual void handle_done_event(int result);
void close_picker();
virtual void handle_done_event(int result);
void close_picker();
+ void update_gui(int color, int alpha);
void update_gui(int color);
int handle_event();
void update_gui(int color);
int handle_event();
@@
-381,9
+383,11
@@
class ColorButtonPicker : public ColorPicker
public:
ColorButtonPicker(ColorButton *color_button);
~ColorButtonPicker();
public:
ColorButtonPicker(ColorButton *color_button);
~ColorButtonPicker();
+ void update(int color, int alpha);
int handle_new_color(int color, int alpha);
void handle_done_event(int result);
void update_gui();
int handle_new_color(int color, int alpha);
void handle_done_event(int result);
void update_gui();
+ void update_gui(int color, int alpha);
ColorButton *color_button;
};
ColorButton *color_button;
};