some cleanups from previous refactors
This commit is contained in:
+6
-1
@@ -157,6 +157,12 @@ Project::Project(QWidget *parent) :
|
||||
tree_view->setModel(sorter);
|
||||
verticalLayout->addWidget(tree_view);
|
||||
|
||||
// Set the first column width
|
||||
// I'm not sure if there's a better way to do this, default behavior seems to have all columns fixed width
|
||||
// and let the last column fill up the remainder when really the opposite would be preferable (having the
|
||||
// first column fill up the majority of the space). Anyway, this will probably do for now.
|
||||
tree_view->setColumnWidth(0, tree_view->width()/2);
|
||||
|
||||
// icon view
|
||||
icon_view_container = new QWidget();
|
||||
|
||||
@@ -202,7 +208,6 @@ Project::Project(QWidget *parent) :
|
||||
connect(directory_up, SIGNAL(clicked(bool)), this, SLOT(go_up_dir()));
|
||||
connect(icon_view, SIGNAL(changed_root()), this, SLOT(set_up_dir_enabled()));
|
||||
|
||||
//retranslateUi(Project);
|
||||
setWindowTitle(tr("Project"));
|
||||
|
||||
update_view_type();
|
||||
|
||||
+4
-4
@@ -731,9 +731,9 @@ void Timeline::set_zoom_value(double v) {
|
||||
center_scroll_to_playhead(horizontalScrollBar, zoom, Olive::ActiveSequence->playhead);
|
||||
}
|
||||
|
||||
void Timeline::set_zoom(bool in) {
|
||||
void Timeline::multiply_zoom(double m) {
|
||||
showing_all = false;
|
||||
set_zoom_value(zoom * ((in) ? 2 : 0.5));
|
||||
set_zoom_value(zoom * m);
|
||||
}
|
||||
|
||||
void Timeline::decheck_tool_buttons(QObject* sender) {
|
||||
@@ -752,11 +752,11 @@ QVector<int> Timeline::get_tracks_of_linked_clips(int i) {
|
||||
}
|
||||
|
||||
void Timeline::zoom_in() {
|
||||
set_zoom(true);
|
||||
multiply_zoom(true);
|
||||
}
|
||||
|
||||
void Timeline::zoom_out() {
|
||||
set_zoom(false);
|
||||
multiply_zoom(false);
|
||||
}
|
||||
|
||||
bool is_clip_selected(Clip* clip, bool containing) {
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ public:
|
||||
~Timeline();
|
||||
|
||||
bool focused();
|
||||
void set_zoom(bool in);
|
||||
void multiply_zoom(double m);
|
||||
void copy(bool del);
|
||||
Clip* split_clip(ComboAction* ca, bool transitions, int p, long frame);
|
||||
Clip* split_clip(ComboAction* ca, bool transitions, int p, long frame, long post_in);
|
||||
|
||||
Reference in New Issue
Block a user