projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'v' shortcut in resource wdw, sams proxy icons, update shortcuts doc
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
colorpicker.h
diff --git
a/cinelerra-5.1/cinelerra/colorpicker.h
b/cinelerra-5.1/cinelerra/colorpicker.h
index 94386e8ef7cabc20020e25b5eb37a49573b57257..0ae021edc6a31696785a5cfc88a2876c70769b24 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.h
+++ b/
cinelerra-5.1/cinelerra/colorpicker.h
@@
-58,11
+58,11
@@
class PaletteHex;
class PaletteGrabButton;
class PaletteHistory;
class PaletteGrabButton;
class PaletteHistory;
-class Color
Thread
: public BC_DialogThread
+class Color
Picker
: public BC_DialogThread
{
public:
{
public:
- Color
Thread
(int do_alpha = 0, const char *title = 0);
- ~Color
Thread
();
+ Color
Picker
(int do_alpha = 0, const char *title = 0);
+ ~Color
Picker
();
void start_window(int output, int alpha, int do_okcancel=0);
virtual int handle_new_color(int output, int alpha);
void start_window(int output, int alpha, int do_okcancel=0);
virtual int handle_new_color(int output, int alpha);
@@
-77,7
+77,7
@@
public:
class ColorWindow : public BC_Window
{
public:
class ColorWindow : public BC_Window
{
public:
- ColorWindow(Color
Thread
*thread, int x, int y, int w, int h, const char *title);
+ ColorWindow(Color
Picker
*thread, int x, int y, int w, int h, const char *title);
~ColorWindow();
void create_objects();
~ColorWindow();
void create_objects();
@@
-88,6
+88,8
@@
public:
void update_hsv();
void update_yuv();
int handle_event();
void update_hsv();
void update_yuv();
int handle_event();
+ void get_screen_sample();
+ int cursor_motion_event();
int button_press_event();
int button_release_event();
int button_press_event();
int button_release_event();
@@
-101,7
+103,7
@@
public:
void update_rgb_hex(const char *hex);
int rgb888();
void update_rgb_hex(const char *hex);
int rgb888();
- Color
Thread
*thread;
+ Color
Picker
*thread;
PaletteWheel *wheel;
PaletteWheelValue *wheel_value;
PaletteOutput *output;
PaletteWheel *wheel;
PaletteWheelValue *wheel_value;
PaletteOutput *output;