diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-17 19:57:27 -0600 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-17 19:57:27 -0600 |
| commit | b385babf77cafda37770ff2593af2a6a37e15260 (patch) | |
| tree | ce201ca20b290625ddfbbb39fb0b111d68ad50f7 /aoscene.cpp | |
| parent | 8d61f6007ecfa3e19aa7cce6afb97aa39f143fac (diff) | |
| parent | 027f95deccef0f17759cbb093dc4097caf8184da (diff) | |
Fix case-insensitive paths on Linux (#34)
Closes #9
Diffstat (limited to 'aoscene.cpp')
| -rw-r--r-- | aoscene.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/aoscene.cpp b/aoscene.cpp index dde671fd..344522b6 100644 --- a/aoscene.cpp +++ b/aoscene.cpp @@ -11,9 +11,9 @@ AOScene::AOScene(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent) void AOScene::set_image(QString p_image) { - QString background_path = ao_app->get_background_path() + p_image + ".png"; - QString animated_background_path = ao_app->get_background_path() + p_image + ".gif"; - QString default_path = ao_app->get_default_background_path() + p_image; + QString background_path = ao_app->get_background_path(p_image + ".png"); + QString animated_background_path = ao_app->get_background_path(p_image + ".gif"); + QString default_path = ao_app->get_default_background_path(p_image + ".png"); QPixmap background(background_path); QPixmap default_bg(default_path); @@ -48,8 +48,8 @@ void AOScene::set_legacy_desk(QString p_image) //vanilla desks vary in both width and height. in order to make that work with viewport rescaling, //some INTENSE math is needed. - QString desk_path = ao_app->get_background_path() + p_image; - QString default_path = ao_app->get_default_background_path() + p_image; + QString desk_path = ao_app->get_background_path(p_image); + QString default_path = ao_app->get_default_background_path(p_image); QPixmap f_desk; @@ -67,7 +67,7 @@ void AOScene::set_legacy_desk(QString p_image) //int final_y = y_modifier * vp_height; //int final_w = w_modifier * f_desk.width(); - int final_h = h_modifier * f_desk.height(); + int final_h = static_cast<int>(h_modifier * f_desk.height()); //this->resize(final_w, final_h); //this->setPixmap(f_desk.scaled(final_w, final_h)); |
