Merged monocle PR joseph/Monocle#106 into our own fork

Zero width in marginal pannels
TronFortyTwo · Apr 28, 2020 · 1990c39 · 1990c39
1 parent b1317e6
commit 1990c39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/html/monocle/scripts/monocore.js b/html/monocle/scripts/monocore.js
@@ -4591,8 +4591,12 @@ Monocle.Panels.Marginal = function (flipper, evtCallbacks) {
     var sheaf = page.m.sheafDiv;
     var bw = sheaf.offsetLeft;
     var fw = page.offsetWidth - (sheaf.offsetLeft + sheaf.offsetWidth);
-    bw = Math.floor(((bw - 2) / page.offsetWidth) * 10000 / 100) + "%";
-    fw = Math.floor(((fw - 2) / page.offsetWidth) * 10000 / 100) + "%";
+	//bw = Math.floor(((bw - 2) / page.offsetWidth) * 10000 / 100) + "%";
+	//fw = Math.floor(((fw - 2) / page.offsetWidth) * 10000 / 100) + "%";
+	bw = Math.round(((bw - 2) / page.offsetWidth) * 10000 / 100 );
+	fw = Math.round(((fw - 2) / page.offsetWidth) * 10000 / 100 );
+	bw = Math.max(bw, 5) + "%";
+	fw = Math.max(fw, 5) + "%";
     p.panels.forwards.properties.div.style.width = fw;
     p.panels.backwards.properties.div.style.width = bw;
   }

diff --git a/ui/Server.qml b/ui/Server.qml
@@ -41,7 +41,6 @@ HttpServer {
         var locus = getBookSetting("locus")
         if (locus == undefined)
             locus = null
-		console.log("locus: " + JSON.stringify(locus));
         response.write("SAVED_PLACE = " + JSON.stringify(locus) + ";\n")
 
         response.end()