projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UI for selecting caption type.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index 30f7061d42b24fb336496e32e0cfc1e883957c91..2214ee13fddb1ba5192b86e35b0e2ab5dc1a6cc1 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-69,7
+69,9
@@
public:
enum Tool {
SELECT,
ZOOM,
enum Tool {
SELECT,
ZOOM,
- ZOOM_ALL
+ ZOOM_ALL,
+ SNAP,
+ SEQUENCE
};
void tool_clicked (Tool t);
};
void tool_clicked (Tool t);
@@
-100,6
+102,7
@@
private:
void scrolled (wxScrollWinEvent& ev);
void set_pixels_per_second (double pps);
void set_pixels_per_track (int h);
void scrolled (wxScrollWinEvent& ev);
void set_pixels_per_second (double pps);
void set_pixels_per_track (int h);
+ void zoom_all ();
boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
TimelineContentViewList selected_views () const;
@@
-130,6
+133,7
@@
private:
int _x_scroll_rate;
int _y_scroll_rate;
int _pixels_per_track;
int _x_scroll_rate;
int _y_scroll_rate;
int _pixels_per_track;
+ bool _first_resize;
static double const _minimum_pixels_per_second;
static int const _minimum_pixels_per_track;
static double const _minimum_pixels_per_second;
static int const _minimum_pixels_per_track;