fix: issues related sciter sdk v5.0.3.0

4silvertooth · 4silvertooth · commit 85980872fb77 · 2023-11-07T12:09:48.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.exe
+*.dll
 .vs
 main/resources.cpp
 *.aps
diff --git a/sdk b/sdk
@@ -1 +1 @@
-Subproject commit b87f720a71deef6c6f1dcf69929f11f11599dca5
+Subproject commit 6f18e8725a8d14b8ba44b2c0d00ca126f119ed21
diff --git a/src/components/browse-storage.css b/src/components/browse-storage.css
@@ -91,26 +91,28 @@
     white-space: pre-wrap;
     word-break: break-all;
   }
-
-  :root > menu.popup {
+}
+@set popup-menu 
+{
+  :root {
     font-size: 10pt;
   }
 
-  :root > menu.popup > li {
+  :root > li {
     foreground-size: 18dip;
     foreground-position: 4dip 50%;
   }
 
-  :root > menu.popup > li:hover {
-    background: color(accent-color);
+  :root > li:hover {
+    //background: color(accent-color);
     cursor: pointer;
   }
   
-  :root > menu.popup > li#delete {
+  :root > li#delete {
     foreground-image: url(../assets/delete.svg);
   }
 
-  :root > menu.popup > li#rename {
+  :root > li#rename {
     foreground-image: url(../assets/rename.svg);
   }  
 }
diff --git a/src/components/browse-storage.js b/src/components/browse-storage.js
@@ -20,7 +20,7 @@ export class BrowseStorage extends Element
   ["on ^click at div.context[key]"](evt, el) {
     const freezed = el.getAttribute("freeze") === 'true' ? true : false;
     this.$("menu.popup > li#delete").state.disabled = freezed;
-    this.popup = el.popup(this.$("menu.popup"));
+    this.popup = el.popup(this.$("menu.popup"), {anchorAt: 5, popupAt: 7});
     return true;
   }
   
@@ -102,7 +102,7 @@ export class BrowseStorage extends Element
           {tape.id === this.renaming ? <input index={index}>{tape.name}</input> : <div.name>{tape.name}</div>}
         </div> 
       })}
-      <menu.popup>
+      <menu.popup styleset={__DIR__ + "browse-storage.css#popup-menu"}>
         <li #rename>Rename</li>
         <li #delete>Delete</li>
       </menu>
diff --git a/src/components/editor.css b/src/components/editor.css
@@ -39,7 +39,7 @@
   }
     
   :root > text {
-    white-space:pre;
+    white-space: pre-wrap;
     height:1.4em;
     line-height:1.4em;
   }
diff --git a/src/components/editor.js b/src/components/editor.js
@@ -341,7 +341,7 @@ export class Editor extends Element {
     );
     if(!toolTipToken) return;
     const tooltip = <popup.tooltip>{toolTipToken.tooltip}</popup>;
-    const position = {x: evt.windowX, y: evt.windowY };
+    const position = {popupAt: 7, x: evt.windowX, y: evt.windowY};
     this.shownPopup = this.popup(tooltip, position);
 
     return true;
diff --git a/src/components/settings.css b/src/components/settings.css
@@ -2,7 +2,7 @@
 {
   :root {
     padding: 12dip;
-    size: 25% *;
+    size: *;
     background: #eee;
   }
 
diff --git a/src/main.css b/src/main.css
@@ -16,8 +16,11 @@
     flow: horizontal;
   }
 
+  :root > section.sidepanel.files {
+    width: 220dip;
+  }
   :root > section.sidepanel {
-    size: 220dip;
+    width: 0.30*;
     height: *;
     background: #eee;
     //flow: stack;
diff --git a/src/main.htm b/src/main.htm
@@ -177,7 +177,7 @@
     }
     
     ["on browse-tapes"](evt, el) {
-      this.componentUpdate({browse: !this.browse});      
+      this.componentUpdate({browse: !this.browse, showSettings: false});      
     }
 
     ["on settings-changed"](evt, form){
@@ -206,7 +206,7 @@
     }
 
     ["on click at :root section.editor > div.controls > #settings"](evt, el){
-      this.componentUpdate({showSettings: true});
+      this.componentUpdate({showSettings: true, browse: false});
     }
     
     ["on settings-close"](evt, el){
@@ -258,7 +258,7 @@
       return <body styleset={__DIR__+"main.css#main"}>
         {
           this.browse && 
-          <section.sidepanel>
+          <section.sidepanel.files>
             <BrowseStorage current={this.currentTape.id} list={Storage.all()}/>
           </section>
         }
@@ -269,7 +269,12 @@
             { hasPdf() && <button #pdf/> }
           </div>
         </section>
-        { this.showSettings && <SettingsForm formData={this.settings}/> }
+        { 
+          this.showSettings && 
+          <section.sidepanel>
+            <SettingsForm formData={this.settings}/>
+          </section>  
+        }  
       </body>;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`*.exe`
	`2`	`+*.dll`
`2`	`3`	`.vs`
`3`	`4`	`main/resources.cpp`
`4`	`5`	`*.aps`
Original file line number	Diff line number	Diff line change
`@@ -91,26 +91,28 @@`
`91`	`91`	`white-space: pre-wrap;`
`92`	`92`	`word-break: break-all;`
`93`	`93`	`}`
`94`		`-`
`95`		`- :root > menu.popup {`
	`94`	`+}`
	`95`	`+@set popup-menu`
	`96`	`+{`
	`97`	`+ :root {`
`96`	`98`	`font-size: 10pt;`
`97`	`99`	`}`
`98`	`100`
`99`		`- :root > menu.popup > li {`
	`101`	`+ :root > li {`
`100`	`102`	`foreground-size: 18dip;`
`101`	`103`	`foreground-position: 4dip 50%;`
`102`	`104`	`}`
`103`	`105`
`104`		`- :root > menu.popup > li:hover {`
`105`		`- background: color(accent-color);`
	`106`	`+ :root > li:hover {`
	`107`	`+ //background: color(accent-color);`
`106`	`108`	`cursor: pointer;`
`107`	`109`	`}`
`108`	`110`
`109`		`- :root > menu.popup > li#delete {`
	`111`	`+ :root > li#delete {`
`110`	`112`	`foreground-image: url(../assets/delete.svg);`
`111`	`113`	`}`
`112`	`114`
`113`		`- :root > menu.popup > li#rename {`
	`115`	`+ :root > li#rename {`
`114`	`116`	`foreground-image: url(../assets/rename.svg);`
`115`	`117`	`}`
`116`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`:root > text {`
`42`		`- white-space:pre;`
	`42`	`+ white-space: pre-wrap;`
`43`	`43`	`height:1.4em;`
`44`	`44`	`line-height:1.4em;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`:root {`
`4`	`4`	`padding: 12dip;`
`5`		`- size: 25% *;`
	`5`	`+ size: *;`
`6`	`6`	`background: #eee;`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`["on browse-tapes"](evt, el) {`
`180`		`- this.componentUpdate({browse: !this.browse});`
	`180`	`+ this.componentUpdate({browse: !this.browse, showSettings: false});`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`["on settings-changed"](evt, form){`
`@@ -206,7 +206,7 @@`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`["on click at :root section.editor > div.controls > #settings"](evt, el){`
`209`		`- this.componentUpdate({showSettings: true});`
	`209`	`+ this.componentUpdate({showSettings: true, browse: false});`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`["on settings-close"](evt, el){`
`@@ -258,7 +258,7 @@`
`258`	`258`	`return <body styleset={__DIR__+"main.css#main"}>`
`259`	`259`	`{`
`260`	`260`	`this.browse &&`
`261`		`- <section.sidepanel>`
	`261`	`+ <section.sidepanel.files>`
`262`	`262`	`<BrowseStorage current={this.currentTape.id} list={Storage.all()}/>`
`263`	`263`	`</section>`
`264`	`264`	`}`
`@@ -269,7 +269,12 @@`
`269`	`269`	`{ hasPdf() && <button #pdf/> }`
`270`	`270`	`</div>`
`271`	`271`	`</section>`
`272`		`- { this.showSettings && <SettingsForm formData={this.settings}/> }`
	`272`	`+ {`
	`273`	`+ this.showSettings &&`
	`274`	`+ <section.sidepanel>`
	`275`	`+ <SettingsForm formData={this.settings}/>`
	`276`	`+ </section>`
	`277`	`+ }`
`273`	`278`	`</body>;`
`274`	`279`	`}`
`275`	`280`	`}`