Overlays folder #31
Merged
Overlays folder #31
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Crystalwarrior
requested changes
Dec 8, 2024
src/path_functions.cpp
Outdated
| } | ||
| else if (file_exists(get_image_suffix( | ||
| VPath("overlays/" + w_courtroom->server_overlay)))) { | ||
| f_desk_image = w_courtroom->server_overlay; |
There was a problem hiding this comment.
what even changes? This is the same line as L147
There was a problem hiding this comment.
Suggested change
| f_desk_image = w_courtroom->server_overlay; | |
| f_desk_image = "overlays/" + w_courtroom->server_overlay; |
src/aolayer.cpp
Outdated
Comment on lines
158
to
169
| QString final_path = ""; | ||
| if (!desk) { | ||
| final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename)); | ||
| } | ||
| else { | ||
| if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(p_filename)))) { | ||
| final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename)); | ||
| } | ||
| else { | ||
| final_path = ao_app->get_image_suffix(VPath("overlays/" + p_filename)); | ||
| } | ||
| } |
There was a problem hiding this comment.
All of this should be done in get_pos_path, not here.
src/aolayer.cpp
Outdated
| @@ -144,7 +144,7 @@ void AOLayer::move_and_center(int ax, int ay) | |||
| center_pixmap(movie_frames[0]); // just use the first frame since dimensions are all that matter | |||
| } | |||
|
|
|||
| void BackgroundLayer::load_image(QString p_filename) | |||
| void BackgroundLayer::load_image(QString p_filename, bool desk) | |||
There was a problem hiding this comment.
Why is bool desk necessary?
include/aolayer.h
Outdated
| @@ -178,7 +178,7 @@ class BackgroundLayer : public AOLayer { | |||
| Q_OBJECT | |||
| public: | |||
| BackgroundLayer(QWidget *p_parent, AOApplication *p_ao_app); | |||
| void load_image(QString p_filename); | |||
| void load_image(QString p_filename, bool desk = false); | |||
There was a problem hiding this comment.
Why is bool desk necessary?
src/path_functions.cpp
Outdated
| @@ -140,13 +140,17 @@ QString AOApplication::get_pos_path(const QString& pos, const bool desk) | |||
| QString desk_override = read_design_ini("overlays/" + f_background, get_background_path("design.ini")); | |||
There was a problem hiding this comment.
design_ini override is checked here. But overlays/ folder override is only checked after the image is attempted to be loaded, inside the background layer itself? Doesn't that order betray the PR description?
* You refer to a pos inside of the current BG * You refer to an overlay folder and want to draw pos from it depending on your current pos * You refer to a pos inside of an overlay folder Add DRO client positions.ini support Fix niche issues where background is not shown, or where pos_remove button doesn't appear (for example, if the chara's default pos is not present on the current dropdown list)
* Fix overlays being impossible to clear
Crystalwarrior
approved these changes
Dec 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now is possible to load overlays in a specific folder inside base folder called overlays.
In this folder should be every general overlays.
Right now overlays load priority is:
Folder written in design.ini > overlays in specific background folder > overlays folder