[Bf-blender-cvs] [fdd32d8a15e] filebrowser_redesign: UI: File Browser File Type Changes
Harley Acheson
noreply at git.blender.org
Sun Aug 11 22:34:32 CEST 2019
Commit: fdd32d8a15e83c8eb39a5895cffccff256018eb9
Author: Harley Acheson
Date: Sun Aug 11 13:33:47 2019 -0700
Branches: filebrowser_redesign
https://developer.blender.org/rBfdd32d8a15e83c8eb39a5895cffccff256018eb9
UI: File Browser File Type Changes
This adjusts the vertical aligment of the little icons show inside files and folders
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/editors/space_file/file_draw.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 63f65770e67..963e29bd16e 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 63f65770e67f38db29f76ac910dd87bd9841b919
+Subproject commit 963e29bd16e49c9bf227538c1042cf5c86cd9b28
diff --git a/release/scripts/addons b/release/scripts/addons
index 37a8bdc6616..802904cf43d 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 37a8bdc661649cb6197e73b5eb96481cd5fb0c5e
+Subproject commit 802904cf43da3deed2094520e17a79d8020d372a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index d9ed9d4d064..003f117c7dd 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit d9ed9d4d064c74c86e2767cd4be32d602a0ee317
+Subproject commit 003f117c7dd115aa703f80bef784e485ecb9d003
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 313b51f099d..18eb0b08912 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -257,13 +257,14 @@ static void file_draw_preview(uiBlock *block,
float icon_size = 16.0f / icon_aspect * U.dpi_fac;
icon_x = xco + (ex / 2.0f) - (icon_size / 2.0f);
if (typeflags & FILE_TYPE_DIR) {
- icon_y = yco + (ey / 2.0f) - (icon_size * 1.52f);
+ icon_y = yco + (ey / 2.0f) - (icon_size * 0.78f);
}
else {
- icon_y = yco + (ey / 2.0f) - (icon_size * 1.0f);
+ icon_y = yco + (ey / 2.0f) - (icon_size * 0.65f);
}
+ float icon_opacity = MIN2(icon_aspect, 0.8);
UI_icon_draw_ex(
- icon_x, icon_y, icon, icon_aspect / U.dpi_fac, icon_aspect, 0.0f, NULL, false);
+ icon_x, icon_y, icon, icon_aspect / U.dpi_fac, icon_opacity, 0.0f, NULL, false);
}
else {
/* Smaller, fainter icon for preview image thumbnail. */
diff --git a/source/tools b/source/tools
index 4fad0d8ffc9..fb176f7ea37 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 4fad0d8ffc9a90e4c6660b3f7512f23cb4a086a7
+Subproject commit fb176f7ea370fa522a55243a6dff059dde27638e
More information about the Bf-blender-cvs
mailing list