summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
99d4a08)
This way, UI elements can decide whether they can change UI
settings or whether they are already using user-set values.
scale_(1e-3),
offset_(0),
updating_scroll_(false),
scale_(1e-3),
offset_(0),
updating_scroll_(false),
+ settings_restored_(false),
sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
always_zoom_to_fit_(false),
tick_period_(0),
sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
always_zoom_to_fit_(false),
tick_period_(0),
scroll_needs_defaults_ = false;
// Note: see eventFilter() for additional information
}
scroll_needs_defaults_ = false;
// Note: see eventFilter() for additional information
}
+
+ settings_restored_ = true;
}
vector< shared_ptr<TimeItem> > View::time_items() const
}
vector< shared_ptr<TimeItem> > View::time_items() const
void View::on_repeat_splitter_expansion()
{
void View::on_repeat_splitter_expansion()
{
- expand_header_to_fit();
+ // Don't mess with the header if settings were restored in the meanwhile
+ if (!settings_restored_)
+ expand_header_to_fit();
}
void View::h_scroll_value_changed(int value)
}
void View::h_scroll_value_changed(int value)
pv::util::Timestamp offset_;
bool updating_scroll_;
pv::util::Timestamp offset_;
bool updating_scroll_;
+ bool settings_restored_;
+
bool sticky_scrolling_;
bool coloured_bg_;
bool always_zoom_to_fit_;
bool sticky_scrolling_;
bool coloured_bg_;
bool always_zoom_to_fit_;