diff options
author | Lioncash <mathew1800@gmail.com> | 2019-05-20 20:53:40 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-05-20 20:53:44 +0200 |
commit | 922d8c6cb47d9a1df8e481e825d680e07f70caf6 (patch) | |
tree | a63c010ca0c920fbd95b6e6d9e580839d8773e4e /src | |
parent | yuzu/bootmanager: Specify string conversions explicitly (diff) | |
download | yuzu-922d8c6cb47d9a1df8e481e825d680e07f70caf6.tar yuzu-922d8c6cb47d9a1df8e481e825d680e07f70caf6.tar.gz yuzu-922d8c6cb47d9a1df8e481e825d680e07f70caf6.tar.bz2 yuzu-922d8c6cb47d9a1df8e481e825d680e07f70caf6.tar.lz yuzu-922d8c6cb47d9a1df8e481e825d680e07f70caf6.tar.xz yuzu-922d8c6cb47d9a1df8e481e825d680e07f70caf6.tar.zst yuzu-922d8c6cb47d9a1df8e481e825d680e07f70caf6.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/yuzu/loading_screen.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp index 4e2d988cd..4f2bfab48 100644 --- a/src/yuzu/loading_screen.cpp +++ b/src/yuzu/loading_screen.cpp @@ -30,11 +30,11 @@ #include <QMovie> #endif -constexpr const char PROGRESSBAR_STYLE_PREPARE[] = R"( +constexpr char PROGRESSBAR_STYLE_PREPARE[] = R"( QProgressBar {} QProgressBar::chunk {})"; -constexpr const char PROGRESSBAR_STYLE_DECOMPILE[] = R"( +constexpr char PROGRESSBAR_STYLE_DECOMPILE[] = R"( QProgressBar { background-color: black; border: 2px solid white; @@ -46,7 +46,7 @@ QProgressBar::chunk { width: 1px; })"; -constexpr const char PROGRESSBAR_STYLE_BUILD[] = R"( +constexpr char PROGRESSBAR_STYLE_BUILD[] = R"( QProgressBar { background-color: black; border: 2px solid white; @@ -58,7 +58,7 @@ QProgressBar::chunk { width: 1px; })"; -constexpr const char PROGRESSBAR_STYLE_COMPLETE[] = R"( +constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"( QProgressBar { background-color: #0ab9e6; border: 2px solid white; @@ -149,10 +149,10 @@ void LoadingScreen::OnLoadComplete() { void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total) { using namespace std::chrono; - auto now = high_resolution_clock::now(); + const auto now = high_resolution_clock::now(); // reset the timer if the stage changes if (stage != previous_stage) { - ui->progress_bar->setStyleSheet(progressbar_style[stage]); + ui->progress_bar->setStyleSheet(QString::fromUtf8(progressbar_style[stage])); // Hide the progress bar during the prepare stage if (stage == VideoCore::LoadCallbackStage::Prepare) { ui->progress_bar->hide(); @@ -178,16 +178,16 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size slow_shader_first_value = value; } // only calculate an estimate time after a second has passed since stage change - auto diff = duration_cast<milliseconds>(now - slow_shader_start); + const auto diff = duration_cast<milliseconds>(now - slow_shader_start); if (diff > seconds{1}) { - auto eta_mseconds = + const auto eta_mseconds = static_cast<long>(static_cast<double>(total - slow_shader_first_value) / (value - slow_shader_first_value) * diff.count()); estimate = tr("Estimated Time %1") .arg(QTime(0, 0, 0, 0) .addMSecs(std::max<long>(eta_mseconds - diff.count() + 1000, 1000)) - .toString("mm:ss")); + .toString(QStringLiteral("mm:ss"))); } } |