Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-14 23:27:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #25524 from Calinou/fix-font-oversampling-warning

Browse Source 
Fix a font oversampling warning being printed when it shouldn't
This commit is contained in:
Rémi Verschelde 2019-02-08 11:52:45 +01:00 committed by GitHub
commit 3dd00e77b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/main/scene_tree.cpp
View File

@ -1154,13 +1154,14 @@ void SceneTree::_update_root_rect() {
float viewport_aspect = desired_res.aspect();
float video_mode_aspect = video_mode.aspect();
if (use_font_oversampling && stretch_aspect == STRETCH_ASPECT_IGNORE) {
WARN_PRINT("Font oversampling only works with the resize modes 'Keep Width', 'Keep Height', and 'Expand'.");
}
if (stretch_aspect == STRETCH_ASPECT_IGNORE || ABS(viewport_aspect - video_mode_aspect) < CMP_EPSILON) {
//same aspect or ignore aspect
viewport_size = desired_res;
screen_size = video_mode;
if (use_font_oversampling) {
WARN_PRINT("Font oversampling only works with the following resize modes 'Keep Width', 'Keep Height', and 'Expand'.")
}
} else if (viewport_aspect < video_mode_aspect) {
// screen ratio is smaller vertically