skyler
/
Lightningbeam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make active object a stack

This commit is contained in:
Skyler Lehmkuhl 2024-12-16 19:27:51 -05:00
parent dc2f772da3
commit f8a31b9ae3
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.js
View File

@ -2049,7 +2049,16 @@ class GraphicsObject {
} }
let root = new GraphicsObject("root"); let root = new GraphicsObject("root");
context.activeObject = root Object.defineProperty(
context,
'activeObject',
{
get: function() {
return this.objectStack.at(-1)
}
}
);
context.objectStack = [root]
async function greet() { async function greet() {
// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/ // Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
@ -2254,7 +2263,7 @@ function decrementFrame() {
function _newFile(width, height, fps) { function _newFile(width, height, fps) {
root = new GraphicsObject("root"); root = new GraphicsObject("root");
context.activeObject = root context.objectStack = [root]
fileWidth = width fileWidth = width
fileHeight = height fileHeight = height
fileFps = fps fileFps = fps
@ -3140,7 +3149,7 @@ function stage() {
let child = context.activeObject.children[i] let child = context.activeObject.children[i]
if (!(child.idx in context.activeObject.currentFrame.keys)) continue; if (!(child.idx in context.activeObject.currentFrame.keys)) continue;
if (hitTest(mouse, child)) { if (hitTest(mouse, child)) {
context.activeObject = child; context.objectStack.push(child)
context.selection = []; context.selection = [];
context.shapeselection = []; context.shapeselection = [];
updateUI() updateUI()
@ -3153,7 +3162,7 @@ function stage() {
if (context.activeObject.parent) { if (context.activeObject.parent) {
context.selection = [context.activeObject] context.selection = [context.activeObject]
context.shapeselection = [] context.shapeselection = []
context.activeObject = context.activeObject.parent context.objectStack.pop()
updateUI() updateUI()
updateLayers() updateLayers()
updateMenu() updateMenu()