Fix upable to paint in 2D editor

Fix hover issue with menu item side menu
JannisX11 · May 27, 2023 · 64caffa · 64caffa
1 parent a275be5
commit 64caffa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/js/interface/menu.js b/js/interface/menu.js
@@ -186,9 +186,14 @@ class Menu {
  node.addClass('hybrid_parent');
  let more_button = Interface.createElement('div', {class: 'menu_more_button'}, Blockbench.getIconNode('more_horiz'));
  node.append(more_button);
- $(more_button).mouseenter(e => {
+ more_button.addEventListener('mouseenter', e => {
  scope.hover(node.get(0), e, true);
  })
+ more_button.addEventListener('mouseleave', e => {
+ if (node.is(':hover') && !childlist.is(':hover')) {
+ scope.hover(node, e);
+ }
+ })
  }
  } else {
  node.addClass('parent');

diff --git a/js/texturing/painter.js b/js/texturing/painter.js
@@ -460,7 +460,9 @@ const Painter = {
  let softness = BarItems.slider_brush_softness.get()/100;
  let b_opacity = BarItems.slider_brush_opacity.get()/255;
  let tool = Toolbox.selected;
- let matrix_id = Painter.current.element.uuid + Painter.current.face;
+ let matrix_id = Painter.current.element
+ ? (Painter.current.element.uuid + Painter.current.face)
+ : Painter.current.face;
 
  ctx.clip()
  if (Painter.current.element instanceof Mesh) {