Merge pull request #1093 from tsoding/1092

[nothing.git] / src / game / level / level_editor / color_picker.h

diff --git a/src/game/level/level_editor/color_picker.h b/src/game/level/level_editor/color_picker.h
index 3dbaaf14741202c60b763c02d09c00161ae5c0b9..2d60a085fdb132ae9ca6141f7ef3f9a03d6ede30 100644 (file)
--- a/src/game/level/level_editor/color_picker.h
+++ b/src/game/level/level_editor/color_picker.h
@@ -14,11 +14,9 @@ typedef enum {
 
 typedef struct {
     Slider sliders[COLOR_SLIDER_N];
-    Color color;
 } ColorPicker;
 
 typedef struct LineStream LineStream;
-typedef struct UndoHistory UndoHistory;
 
 ColorPicker create_color_picker_from_rgba(Color color);
 
@@ -26,12 +24,24 @@ int color_picker_read_from_line_stream(ColorPicker *color_picker,
                                        LineStream *line_stream);
 
 int color_picker_render(const ColorPicker *color_picker,
-                        Camera *camera);
+                        const Camera *camera);
 int color_picker_event(ColorPicker *color_picker,
                        const SDL_Event *event,
-                       int *selected,
-                       UndoHistory *undo_history);
+                       const Camera *camera,
+                       int *selected);
 
 Color color_picker_rgba(const ColorPicker *color_picker);
 
+static inline
+int color_picker_drag(const ColorPicker *color_picker)
+{
+    int result = 0;
+
+    for (int i = 0; i < COLOR_SLIDER_N; ++i) {
+        result = result || color_picker->sliders[i].drag;
+    }
+
+    return result;
+}
+
 #endif  // COLOR_PICKER_H_