jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a full screen loading image which includes some text

Browse source
This commit is contained in:
Simon Fels 2017-05-03 20:47:40 +02:00
commit f61a7f91d6
5 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -105,5 +105,5 @@ if (NOT "${HOST_CMAKE_C_COMPILER}" STREQUAL "")
message(STATUS "Host C compiler: ${HOST_CMAKE_CXX_COMPILER}") message(STATUS "Host C compiler: ${HOST_CMAKE_CXX_COMPILER}")
endif() endif()
install(FILES snap/gui/icon.png DESTINATION share/anbox/ui) install(FILES data/ui/loading-screen.png DESTINATION share/anbox/ui)

BIN
data/ui/loading-screen.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

1
snapcraft.yaml
View file

@ -124,4 +124,5 @@ parts:
make test make test
prime: prime:
- usr/bin/anbox - usr/bin/anbox
- usr/share/anbox
- usr/lib/*-linux-*/ - usr/lib/*-linux-*/

4
src/anbox/cmds/launch.cpp
View file

@ -88,8 +88,8 @@ anbox::cmds::Launch::Launch()
const auto snap_path = utils::get_env_value("SNAP"); const auto snap_path = utils::get_env_value("SNAP");
if (!snap_path.empty()) { if (!snap_path.empty()) {
const auto resource_path = utils::string_format("%s/share/anbox", snap_path); const auto resource_path = utils::string_format("%s/usr/share/anbox", snap_path);
SystemConfiguration::instance().set_resource_path(resource_path) SystemConfiguration::instance().set_resource_path(resource_path);
} }
std::shared_ptr<ui::SplashScreen> ss; std::shared_ptr<ui::SplashScreen> ss;

8
src/anbox/ui/splash_screen.cpp
View file

@ -48,18 +48,16 @@ SplashScreen::SplashScreen() {
if (!renderer) if (!renderer)
BOOST_THROW_EXCEPTION(std::runtime_error("Could not create 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()); auto img = IMG_LoadTexture(renderer, icon_path.c_str());
if (!img) { if (!img) {
const auto msg = utils::string_format("Failed to create texture from %s", icon_path); const auto msg = utils::string_format("Failed to create texture from %s", icon_path);
BOOST_THROW_EXCEPTION(std::runtime_error(msg)); 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_RenderClear(renderer);
SDL_Rect r{0, 0, 1024, 768};
SDL_RenderCopy(renderer, img, nullptr, &r); SDL_RenderCopy(renderer, img, nullptr, &r);
SDL_RenderPresent(renderer); SDL_RenderPresent(renderer);