summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2014-03-11 18:54:28 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-03-11 17:42:42 -0700
commit9cc942376e3b9b709de9bb9c58f9ae63ab1502e0 (patch)
tree0f7624af7fec3a6464d24718acec432635f99a1b /main.cpp
parentb758210c193114901fa0698658ef190b2a0d3c94 (diff)
downloadsubsurface-9cc942376e3b9b709de9bb9c58f9ae63ab1502e0.tar.gz
Only anim if not first dive when openning subsurface with a divelog.
The animation appeared when the user started subsurface with a default file, wich was a little annoying since it didn't had a 'from' position to go and it was also increasing it's size on some window managers that do subtle windows animations when a program starts. This patch treats the first dive opened when the program loads with a divelog pa rameter differently as the following ones storing the velocity value on a temporary, and reassigning it later. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 229696055..e5a53a3d8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -48,8 +48,10 @@ int main(int argc, char **argv)
files.push_back(QString(prefs.default_filename));
}
parse_xml_exit();
- MainWindow::instance()->loadFiles(files);
- MainWindow::instance()->importFiles(importedFiles);
+ MainWindow *m = MainWindow::instance();
+ m->setLoadedWithFiles( !files.isEmpty() || !importedFiles.isEmpty());
+ m->loadFiles(files);
+ m->importFiles(importedFiles);
if (!quit)
run_ui();
exit_ui();