X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=480663981dfdcdae24e9aa306aea562e25baedef;hp=942651f2fbeab4d9ba230638523b0137c680b4c4;hb=54b918a8b84f666bf32548ebd12b93908061d2a6;hpb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h index 942651f2..48066398 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.h +++ b/cinelerra-5.1/cinelerra/cwindowtool.h @@ -118,9 +118,13 @@ public: int handle_event(); CWindowToolGUI *gui; - CWindowCoordSlider *slider; - CWindowCoordRange *range; int type; + CWindowToolAutoRangeTumbler *min_tumbler; + CWindowCoordSlider *slider; + CWindowToolAutoRangeTumbler *max_tumbler; + CWindowToolAutoRangeReset *range_reset; + CWindowToolAutoRangeTextBox *range_text; + CWindowCoordRangeTumbler *range; }; class CWindowCoordSlider : public BC_FSlider @@ -134,11 +138,11 @@ public: CWindowCoord *coord; }; -class CWindowCoordRange : public BC_Tumbler +class CWindowCoordRangeTumbler : public BC_Tumbler { public: - CWindowCoordRange(CWindowCoord *coord, int x, int y); - ~CWindowCoordRange(); + CWindowCoordRangeTumbler(CWindowCoord *coord, int x, int y); + ~CWindowCoordRangeTumbler(); int update(float scale); int handle_up_event(); int handle_down_event(); @@ -804,6 +808,38 @@ public: }; +class CWindowToolAutoRangeTumbler : public BC_Tumbler +{ +public: + CWindowToolAutoRangeTumbler(CWindowCoord *coord, int x, int y, + int use_max, const char *tip); + int handle_up_event(); + int handle_down_event(); + + CWindowCoord *coord; + int use_max; +}; + +class CWindowToolAutoRangeReset : public BC_Button +{ +public: + CWindowToolAutoRangeReset(CWindowCoord *coord, int x, int y); + int handle_event(); + + CWindowCoord *coord; +}; + +class CWindowToolAutoRangeTextBox : public BC_TextBox +{ +public: + CWindowToolAutoRangeTextBox(CWindowCoord *coord, int x, int y); + int button_press_event(); + int handle_event(); + int update_range(); + + CWindowCoord *coord; +}; + class CWindowCameraGUI : public CWindowToolGUI { @@ -814,9 +850,11 @@ public: void create_objects(); void update(); + BC_TitleBar *bar1, *bar2; CWindowCoord *x, *y, *z; CWindowCameraAddKeyframe *add_keyframe; CWindowCameraReset *reset; + BC_TitleBar *bar3, *bar4, *bar5; CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump; CWindowCurveAutoSpan *auto_span; CWindowCurveAutoEdge *auto_edge; @@ -912,9 +950,11 @@ public: void create_objects(); void update(); + BC_TitleBar *bar1, *bar2; CWindowCoord *x, *y, *z; CWindowProjectorAddKeyframe *add_keyframe; CWindowProjectorReset *reset; + BC_TitleBar *bar3, *bar4, *bar5; CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump; CWindowCurveAutoSpan *auto_span; CWindowCurveAutoEdge *auto_edge;