JannisX11/blockbench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stretched textures in vertical UV editor

Browse Source 
Fix "Bright UI Text" label text
Add light_mode class to body when using light theme
Improve keyframe/placeholder sliding
This commit is contained in:
JannisX11 2022-04-20 13:27:36 +02:00
parent 659a40e32c
commit 8e1a547320
8 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
css/general.css
View File

@ -623,54 +623,54 @@
}
/* Theme Borders */
body.theme_borders .contextMenu,
body.theme_borders dialog,
body.theme_borders .dialog_close_button,
body.theme_borders #start_screen content,
body.theme_borders #quick_message_box,
body.theme_borders action_selector > #action_selector_list
{
border: 1px solid var(--color-border);
}
body.theme_borders #start_screen section {
border-bottom: 1px solid var(--color-border);
}
body.theme_borders .panel {
margin-top: -1px;
border-top: 01px solid var(--color-border);
}
body.theme_borders #right_bar {
border-left: 1px solid var(--color-border);
}
body.theme_borders #left_bar {
border-right: 1px solid var(--color-border);
}
body.theme_borders .preview .preview_menu {
right: 0;
}
body.theme_borders .dialog_sidebar {
border-right: 1px solid var(--color-border);
}
body.theme_borders .dialog_handle {
border-bottom: 1px solid var(--color-border);
}
body.theme_borders .dialog_close_button {
right: -1px;
top: -1px;
height: 31px;
}
body.theme_borders li.animation_file {
border-top: 1px solid var(--color-border);
}
body.theme_borders #main_toolbar, body.theme_borders #tab_bar {
border-bottom: 1px solid var(--color-border);
}
body.theme_borders #status_bar {
border-top: 1px solid var(--color-border);
}
body.theme_borders .contextMenu li.menu_separator {
background-color: var(--color-border);
height: 1px;
padding: 0;
opacity: 1;
}
body.theme_borders .contextMenu,
body.theme_borders dialog,
body.theme_borders .dialog_close_button,
body.theme_borders #start_screen content,
body.theme_borders #quick_message_box,
body.theme_borders action_selector > #action_selector_list
{
border: 1px solid var(--color-border);
}
body.theme_borders #start_screen section {
border-bottom: 1px solid var(--color-border);
}
body.theme_borders .panel {
margin-top: -1px;
border-top: 01px solid var(--color-border);
}
body.theme_borders #right_bar {
border-left: 1px solid var(--color-border);
}
body.theme_borders #left_bar {
border-right: 1px solid var(--color-border);
}
body.theme_borders .preview .preview_menu {
right: 0;
}
body.theme_borders .dialog_sidebar {
border-right: 1px solid var(--color-border);
}
body.theme_borders .dialog_handle {
border-bottom: 1px solid var(--color-border);
}
body.theme_borders .dialog_close_button {
right: -1px;
top: -1px;
height: 31px;
}
body.theme_borders li.animation_file {
border-top: 1px solid var(--color-border);
}
body.theme_borders #main_toolbar, body.theme_borders #tab_bar {
border-bottom: 1px solid var(--color-border);
}
body.theme_borders #status_bar {
border-top: 1px solid var(--color-border);
}
body.theme_borders .contextMenu li.menu_separator {
background-color: var(--color-border);
height: 1px;
padding: 0;
opacity: 1;
}

7
css/panels.css
View File

@ -907,6 +907,13 @@
}
#placeholder_buttons li.placeholder_slider label {
cursor: ew-resize;
margin-left: 4px;
min-width: 22px;
display: inline-block;
text-align: center;
}
#placeholder_buttons li.placeholder_slider label:hover {
color: var(--color-light);
}

2
css/prism.css
View File

@ -61,7 +61,7 @@ pre[class*="language-"] {
}
.token.punctuation {
color: #f8f8f2;
color: var(--color-text);
}
.namespace {

2
js/animations/animation.js
View File

@ -2073,7 +2073,7 @@ Interface.definePanels(function() {
let limit = move_calls <= 2 ? 1 : 100;
clientX += Math.clamp(e2.movementX, -limit, limit);
}
let val = Math.round((clientX - e1.clientX) / 30);
let val = Math.round((clientX - e1.clientX) / 45);
let difference = (val - last_val);
if (!difference) return;
difference *= canvasGridSize(e2.shiftKey || Pressing.overrides.shift, e2.ctrlOrCmd || Pressing.overrides.ctrl);

2
js/animations/keyframe.js
View File

@ -1036,7 +1036,7 @@ Interface.definePanels(function() {
let limit = move_calls <= 2 ? 1 : 100;
clientX += Math.clamp(e2.movementX, -limit, limit);
}
let val = Math.round((clientX - e1.clientX) / 30);
let val = Math.round((clientX - e1.clientX) / 40);
let difference = (val - last_val);
if (!difference) return;
if (Toolbox.selected.id === 'rotate_tool') {

1
js/interface/themes.js
View File

@ -366,6 +366,7 @@ const CustomTheme = {
document.body.style.setProperty('--color-'+key, hex);
}
$('meta[name=theme-color]').attr('content', CustomTheme.data.colors.frame);
document.body.classList.toggle('light_mode', new tinycolor(CustomTheme.data.colors.ui).isLight());
if (typeof gizmo_colors != 'undefined') {
let preview_style = window.getComputedStyle(document.getElementById('preview'));

4
js/texturing/uv.js
View File

@ -601,7 +601,7 @@ const UVEditor = {
},
saveViewportOffset() {
let uv_viewport = this.vue.$refs.viewport;
if (!uv_viewport || Blockbench.hasFlag('switching_project')) return;
if (!uv_viewport || !Project || Blockbench.hasFlag('switching_project')) return;
Project.uv_viewport.offset[0] = (uv_viewport.scrollLeft - this.width/2) / this.vue.inner_width;
Project.uv_viewport.offset[1] = (uv_viewport.scrollTop - this.height/2) / this.vue.inner_height;
},
@ -1791,7 +1791,7 @@ Interface.definePanels(function() {
}
},
inner_height() {
return this.height * this.zoom;
return Math.min(this.height * this.zoom, this.width * this.zoom / (this.project_resolution[0] / this.project_resolution[1]));
},
mappable_elements() {
return this.elements.filter(element => element.faces && !element.locked);

2
lang/en.json
View File

@ -572,7 +572,7 @@
"layout.color.light.desc": "Highlighted text",
"layout.color.accent_text": "Accent Text",
"layout.color.accent_text.desc": "Text on accent backgrounds",
"layout.color.bright_ui_text": "Bright UI",
"layout.color.bright_ui_text": "Bright UI Text",
"layout.color.bright_ui_text.desc": "Text on bright backgrounds",
"layout.color.subtle_text": "Subtle Text",
"layout.color.subtle_text.desc": "Secondary text color with less contrast",