From f61a7f91d694b5be88f51c81589408baff3f1299 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Wed, 3 May 2017 20:47:40 +0200 Subject: [PATCH] Use a full screen loading image which includes some text --- CMakeLists.txt | 2 +- data/ui/loading-screen.png | Bin 0 -> 13724 bytes snapcraft.yaml | 1 + src/anbox/cmds/launch.cpp | 4 ++-- src/anbox/ui/splash_screen.cpp | 8 +++----- 5 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 data/ui/loading-screen.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 7be7fdb2..02064fc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,5 +105,5 @@ if (NOT "${HOST_CMAKE_C_COMPILER}" STREQUAL "") message(STATUS "Host C compiler: ${HOST_CMAKE_CXX_COMPILER}") endif() -install(FILES snap/gui/icon.png DESTINATION share/anbox/ui) +install(FILES data/ui/loading-screen.png DESTINATION share/anbox/ui) diff --git a/data/ui/loading-screen.png b/data/ui/loading-screen.png new file mode 100644 index 0000000000000000000000000000000000000000..267836181738c1cc4d05732af9e84d0bac877908 GIT binary patch literal 13724 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 literal 0 HcmV?d00001 diff --git a/snapcraft.yaml b/snapcraft.yaml index dfd0660c..7c4d1506 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -124,4 +124,5 @@ parts: make test prime: - usr/bin/anbox + - usr/share/anbox - usr/lib/*-linux-*/ diff --git a/src/anbox/cmds/launch.cpp b/src/anbox/cmds/launch.cpp index f3094916..16f71ddd 100644 --- a/src/anbox/cmds/launch.cpp +++ b/src/anbox/cmds/launch.cpp @@ -88,8 +88,8 @@ anbox::cmds::Launch::Launch() const auto snap_path = utils::get_env_value("SNAP"); if (!snap_path.empty()) { - const auto resource_path = utils::string_format("%s/share/anbox", snap_path); - SystemConfiguration::instance().set_resource_path(resource_path) + const auto resource_path = utils::string_format("%s/usr/share/anbox", snap_path); + SystemConfiguration::instance().set_resource_path(resource_path); } std::shared_ptr ss; diff --git a/src/anbox/ui/splash_screen.cpp b/src/anbox/ui/splash_screen.cpp index c8c7f868..c4ca6cf8 100644 --- a/src/anbox/ui/splash_screen.cpp +++ b/src/anbox/ui/splash_screen.cpp @@ -48,18 +48,16 @@ SplashScreen::SplashScreen() { if (!renderer) BOOST_THROW_EXCEPTION(std::runtime_error("Could not create renderer")); - const auto icon_path = utils::string_format("%s/ui/icon.png", SystemConfiguration::instance().resource_dir()); + const auto icon_path = utils::string_format("%s/ui/loading-screen.png", SystemConfiguration::instance().resource_dir()); auto img = IMG_LoadTexture(renderer, icon_path.c_str()); if (!img) { const auto msg = utils::string_format("Failed to create texture from %s", icon_path); BOOST_THROW_EXCEPTION(std::runtime_error(msg)); } - const auto tex_width = 128, tex_height = 128; - SDL_Rect r{(width - tex_width) / 2, (height - tex_height) / 2, 128, 128}; - - SDL_SetRenderDrawColor(renderer, 0xee, 0xee, 0xee, 0xff); SDL_RenderClear(renderer); + + SDL_Rect r{0, 0, 1024, 768}; SDL_RenderCopy(renderer, img, nullptr, &r); SDL_RenderPresent(renderer); -- GitLab