瀏覽代碼

Fix frame (NME)

David Catuhe 5 年之前
父節點
當前提交
39a5b39c86
共有 2 個文件被更改,包括 27 次插入17 次删除
  1. 19 13
      nodeEditor/src/diagram/graphCanvas.scss
  2. 8 4
      nodeEditor/src/diagram/graphFrame.ts

+ 19 - 13
nodeEditor/src/diagram/graphCanvas.scss

@@ -113,17 +113,23 @@
             display: grid;
             grid-template-rows: 40px calc(100% - 40px);
             grid-template-columns: 100%;            
-            border: transparent solid 4px;
             box-sizing: border-box;
 
             &.collapsed {
                 height: auto !important;
                 width: 200px !important;
-                border-radius: 12px;
 
                 .frame-box-header {
                     font-size: 16px;
-                    border-radius: 12px 12px 0 0;
+                    grid-template-columns: calc(100% - 37px) 30px 7px;  
+                    
+                    .frame-box-header-collapse {
+                        margin-top: -2px;
+                    }
+                    
+                    .frame-box-header-close {
+                        display: none;
+                    }
                 }
             }
 
@@ -136,19 +142,17 @@
                 text-align: center;
                 display: grid;
                 grid-template-rows: 100%;  
-                grid-template-columns: calc(100% - 60px) 30px 30px;  
+                grid-template-columns: calc(100% - 74px) 30px 7px 30px 7px;  
                 align-content: center;
                 overflow: hidden;
-                margin: -4px;
-                border: rgba(72, 72, 72, 1) solid 4px;
-                border-bottom: 0;
 
                 .frame-box-header-button {
                     cursor: pointer;
                     align-self: center;
                     transform-origin: 50% 50%;
                     transform: scale(1);
-                    stroke: white;     
+                    stroke: transparent;
+                    fill: white;
                     display: grid;               
 
                     &.down {
@@ -162,7 +166,7 @@
                 }
 
                 .frame-box-header-close {
-                    grid-column: 3;
+                    grid-column: 4;
                     grid-row: 1;
                 }
 
@@ -179,8 +183,10 @@
             }
 
             .port-container {
-                margin-top: 10px;      
-                margin-bottom: 10px;      
+                margin-top: 6px;      
+                margin-bottom: 6px; 
+                margin-left: 4px;     
+                margin-right: 4px;     
                 color: white;
                 grid-row: 2;
                 grid-column: 1;
@@ -191,10 +197,10 @@
             }
 
             &.selected {
-                border-color: white;
+                outline: white solid 4px;
 
                 .frame-box-header {
-                    border-color: white !important;
+                  //  border-color: white !important;
                 }
             }
         }

+ 8 - 4
nodeEditor/src/diagram/graphFrame.ts

@@ -33,9 +33,9 @@ export class GraphFrame {
     private _ports: NodePort[] = [];
     private _controlledPorts: NodePort[] = [];
 
-    private readonly CloseSVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><defs><style>.cls-1{fill:none;}</style></defs><title>closeIcon</title><g id="Layer_2" data-name="Layer 2"><path class="cls-1" d="M16,15l5.85,5.84-1,1L15,15.93,9.15,21.78l-1-1L14,15,8.19,9.12l1-1L15,14l5.84-5.84,1,1Z"/></g></svg>`;
-    private readonly ExpandSVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><defs><style>.cls-1{fill:none;}</style></defs><title>expandIcon</title><g id="Layer_2" data-name="Layer 2"><path class="cls-1" d="M22.31,7.69V22.31H7.69V7.69ZM21.19,8.81H8.81V21.19H21.19Zm-6.75,6.75H11.06V14.44h3.38V11.06h1.12v3.38h3.38v1.12H15.56v3.38H14.44Z"/></g></svg>`;
-    private readonly CollapseSVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><defs><style>.cls-1{fill:none;}</style></defs><title>CollapseIcon</title><g id="Layer_2" data-name="Layer 2"><path class="cls-1" d="M22.31,7.69V22.31H7.69V7.69ZM21.19,8.81H8.81V21.19H21.19Zm-2.25,6.75H11.06V14.44h7.88Z"/></g></svg>`;
+    private readonly CloseSVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><g id="Layer_2" data-name="Layer 2"><path d="M16,15l5.85,5.84-1,1L15,15.93,9.15,21.78l-1-1L14,15,8.19,9.12l1-1L15,14l5.84-5.84,1,1Z"/></g></svg>`;
+    private readonly ExpandSVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><g id="Layer_2" data-name="Layer 2"><path d="M22.31,7.69V22.31H7.69V7.69ZM21.19,8.81H8.81V21.19H21.19Zm-6.75,6.75H11.06V14.44h3.38V11.06h1.12v3.38h3.38v1.12H15.56v3.38H14.44Z"/></g></svg>`;
+    private readonly CollapseSVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><g id="Layer_2" data-name="Layer 2"><path d="M22.31,7.69V22.31H7.69V7.69ZM21.19,8.81H8.81V21.19H21.19Zm-2.25,6.75H11.06V14.44h7.88Z"/></g></svg>`;
 
     public get isCollapsed() {
         return this._isCollapsed;
@@ -238,7 +238,8 @@ export class GraphFrame {
 
         this._headerCollapseElement = root.ownerDocument!.createElement("div"); 
         this._headerCollapseElement.classList.add("frame-box-header-collapse");   
-        this._headerCollapseElement.classList.add("frame-box-header-button");     
+        this._headerCollapseElement.classList.add("frame-box-header-button");  
+        this._headerCollapseElement.title = "Collapse";   
         this._headerCollapseElement.ondragstart= () => false;
         this._headerCollapseElement.addEventListener("pointerdown", (evt) => {
             this._headerCollapseElement.classList.add("down");
@@ -251,8 +252,10 @@ export class GraphFrame {
 
             if (this.isCollapsed) {                
                 this._headerCollapseElement.innerHTML = this.ExpandSVG;
+                this._headerCollapseElement.title = "Expand";   
             } else {
                 this._headerCollapseElement.innerHTML = this.CollapseSVG;
+                this._headerCollapseElement.title = "Collapse";   
             }
         });
         this._headerCollapseElement.innerHTML = this.CollapseSVG;
@@ -261,6 +264,7 @@ export class GraphFrame {
         this._headerCloseElement = root.ownerDocument!.createElement("div"); 
         this._headerCloseElement.classList.add("frame-box-header-close");
         this._headerCloseElement.classList.add("frame-box-header-button");
+        this._headerCloseElement.title = "Close";
         this._headerCloseElement.ondragstart= () => false;
         this._headerCloseElement.addEventListener("pointerdown", (evt) => {
             evt.stopPropagation();