--- a/svghmi/gen_index_xhtml.xslt Wed Dec 16 15:44:24 2020 +0100
+++ b/svghmi/gen_index_xhtml.xslt Thu Dec 17 19:31:00 2020 +0100
@@ -3084,6 +3084,10 @@
</xsl:text>
<xsl:text> this.box_bbox = this.box_elt.getBBox()
</xsl:text>
+ <xsl:text> this.highlight_bbox = this.highlight_elt.getBBox()
+</xsl:text>
+ <xsl:text> this.highlight_elt.style.visibility = "hidden";
+</xsl:text>
<xsl:text>
</xsl:text>
<xsl:text> // Compute margins
@@ -3228,7 +3232,7 @@
</xsl:text>
<xsl:text> let backup = first.getAttribute("dy");
</xsl:text>
- <xsl:text> // apply lift asr a dy added too first span (y attrib stays)
+ <xsl:text> // apply lift as a dy added too first span (y attrib stays)
</xsl:text>
<xsl:text> first.setAttribute("dy", "-"+String((this.lift+1)*1.1)+"em");
</xsl:text>
@@ -3306,6 +3310,8 @@
</xsl:text>
<xsl:text> this.reset_box();
</xsl:text>
+ <xsl:text> this.reset_highlight();
+</xsl:text>
<xsl:text> // Put the button back in place
</xsl:text>
<xsl:text> this.element.appendChild(this.button_elt);
@@ -3326,289 +3332,359 @@
</xsl:text>
<xsl:text> let txt = this.text_elt;
</xsl:text>
+ <xsl:text> let original_text_y = this.text_bbox.y;
+</xsl:text>
+ <xsl:text> let highlight = this.highlight_elt;
+</xsl:text>
+ <xsl:text> let original_h_y = this.highlight_bbox.y;
+</xsl:text>
+ <xsl:text> let clickable = highlight.cloneNode();
+</xsl:text>
+ <xsl:text> let yoffset = span.getBBox().y - original_text_y;
+</xsl:text>
+ <xsl:text> clickable.y.baseVal.value = original_h_y + yoffset;
+</xsl:text>
+ <xsl:text> clickable.style.pointerEvents = "bounding-box";
+</xsl:text>
+ <xsl:text> //clickable.style.visibility = "hidden";
+</xsl:text>
+ <xsl:text> //clickable.onclick = () => alert("love JS");
+</xsl:text>
+ <xsl:text> clickable.onclick = func;
+</xsl:text>
+ <xsl:text> this.element.appendChild(clickable);
+</xsl:text>
+ <xsl:text> this.clickables.push(clickable)
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> reset_clickables() {
+</xsl:text>
+ <xsl:text> while(this.clickables.length){
+</xsl:text>
+ <xsl:text> this.element.removeChild(this.clickables.pop());
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> // Set text content when content is smaller than menu (no scrolling)
+</xsl:text>
+ <xsl:text> set_complete_text(){
+</xsl:text>
+ <xsl:text> let spans = this.text_elt.children;
+</xsl:text>
+ <xsl:text> let c = 0;
+</xsl:text>
+ <xsl:text> for(let item of this.content){
+</xsl:text>
+ <xsl:text> let span=spans[c];
+</xsl:text>
+ <xsl:text> span.textContent = item;
+</xsl:text>
+ <xsl:text> let sel = c;
+</xsl:text>
+ <xsl:text> this.make_clickable(span, (evt) => this.bound_on_selection_click(sel));
+</xsl:text>
+ <xsl:text> c++;
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> // Move partial view :
+</xsl:text>
+ <xsl:text> // false : upward, lower value
+</xsl:text>
+ <xsl:text> // true : downward, higher value
+</xsl:text>
+ <xsl:text> scroll(forward){
+</xsl:text>
+ <xsl:text> let contentlength = this.content.length;
+</xsl:text>
+ <xsl:text> let spans = this.text_elt.children;
+</xsl:text>
+ <xsl:text> let spanslength = spans.length;
+</xsl:text>
+ <xsl:text> // reduce accounted menu size according to prsence of scroll buttons
+</xsl:text>
+ <xsl:text> // since we scroll there is necessarly one button
+</xsl:text>
+ <xsl:text> spanslength--;
+</xsl:text>
+ <xsl:text> if(forward){
+</xsl:text>
+ <xsl:text> // reduce accounted menu size because of back button
+</xsl:text>
+ <xsl:text> if(this.menu_offset != 0) spanslength--;
+</xsl:text>
+ <xsl:text> this.menu_offset = Math.min(
+</xsl:text>
+ <xsl:text> contentlength - spans.length + 1,
+</xsl:text>
+ <xsl:text> this.menu_offset + spanslength);
+</xsl:text>
+ <xsl:text> }else{
+</xsl:text>
+ <xsl:text> if(this.menu_offset - spanslength > 0) spanslength--;
+</xsl:text>
+ <xsl:text> this.menu_offset = Math.max(
+</xsl:text>
+ <xsl:text> 0,
+</xsl:text>
+ <xsl:text> this.menu_offset - spanslength);
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> if(this.menu_offset == 1)
+</xsl:text>
+ <xsl:text> this.menu_offset = 0;
+</xsl:text>
+ <xsl:text>
+</xsl:text>
+ <xsl:text> this.reset_highlight();
+</xsl:text>
+ <xsl:text>
+</xsl:text>
+ <xsl:text> this.reset_clickables();
+</xsl:text>
+ <xsl:text> this.set_partial_text();
+</xsl:text>
+ <xsl:text>
+</xsl:text>
+ <xsl:text> this.highlight_selection();
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> // Setup partial view text content
+</xsl:text>
+ <xsl:text> // with jumps at first and last entry when appropriate
+</xsl:text>
+ <xsl:text> set_partial_text(){
+</xsl:text>
+ <xsl:text> let spans = this.text_elt.children;
+</xsl:text>
+ <xsl:text> let contentlength = this.content.length;
+</xsl:text>
+ <xsl:text> let spanslength = spans.length;
+</xsl:text>
+ <xsl:text> let i = this.menu_offset, c = 0;
+</xsl:text>
+ <xsl:text> let m = this.box_bbox;
+</xsl:text>
+ <xsl:text> while(c < spanslength){
+</xsl:text>
+ <xsl:text> let span=spans[c];
+</xsl:text>
+ <xsl:text> let onclickfunc;
+</xsl:text>
+ <xsl:text> // backward jump only present if not exactly at start
+</xsl:text>
+ <xsl:text> if(c == 0 && i != 0){
+</xsl:text>
+ <xsl:text> span.textContent = "▲";
+</xsl:text>
+ <xsl:text> onclickfunc = this.bound_on_backward_click;
+</xsl:text>
+ <xsl:text> let o = span.getBBox();
+</xsl:text>
+ <xsl:text> span.setAttribute("dx", (m.width - o.width)/2);
+</xsl:text>
+ <xsl:text> // presence of forward jump when not right at the end
+</xsl:text>
+ <xsl:text> }else if(c == spanslength-1 && i < contentlength - 1){
+</xsl:text>
+ <xsl:text> span.textContent = "▼";
+</xsl:text>
+ <xsl:text> onclickfunc = this.bound_on_forward_click;
+</xsl:text>
+ <xsl:text> let o = span.getBBox();
+</xsl:text>
+ <xsl:text> span.setAttribute("dx", (m.width - o.width)/2);
+</xsl:text>
+ <xsl:text> // otherwise normal content
+</xsl:text>
+ <xsl:text> }else{
+</xsl:text>
+ <xsl:text> span.textContent = this.content[i];
+</xsl:text>
+ <xsl:text> let sel = i;
+</xsl:text>
+ <xsl:text> onclickfunc = (evt) => this.bound_on_selection_click(sel);
+</xsl:text>
+ <xsl:text> span.removeAttribute("dx");
+</xsl:text>
+ <xsl:text> i++;
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> this.make_clickable(span, onclickfunc);
+</xsl:text>
+ <xsl:text> c++;
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> open(){
+</xsl:text>
+ <xsl:text> let length = this.content.length;
+</xsl:text>
+ <xsl:text> // systematically reset text, to strip eventual whitespace spans
+</xsl:text>
+ <xsl:text> this.reset_text();
+</xsl:text>
+ <xsl:text> // grow as much as needed or possible
+</xsl:text>
+ <xsl:text> let slots = this.grow_text(length);
+</xsl:text>
+ <xsl:text> // Depending on final size
+</xsl:text>
+ <xsl:text> if(slots == length) {
+</xsl:text>
+ <xsl:text> // show all at once
+</xsl:text>
+ <xsl:text> this.set_complete_text();
+</xsl:text>
+ <xsl:text> } else {
+</xsl:text>
+ <xsl:text> // eventualy align menu to current selection, compensating for lift
+</xsl:text>
+ <xsl:text> let offset = this.last_selection - this.lift;
+</xsl:text>
+ <xsl:text> if(offset > 0)
+</xsl:text>
+ <xsl:text> this.menu_offset = Math.min(offset + 1, length - slots + 1);
+</xsl:text>
+ <xsl:text> else
+</xsl:text>
+ <xsl:text> this.menu_offset = 0;
+</xsl:text>
+ <xsl:text> // show surrounding values
+</xsl:text>
+ <xsl:text> this.set_partial_text();
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> // Now that text size is known, we can set the box around it
+</xsl:text>
+ <xsl:text> this.adjust_box_to_text();
+</xsl:text>
+ <xsl:text> // Take button out until menu closed
+</xsl:text>
+ <xsl:text> this.element.removeChild(this.button_elt);
+</xsl:text>
+ <xsl:text> // Rise widget to top by moving it to last position among siblings
+</xsl:text>
+ <xsl:text> this.element.parentNode.appendChild(this.element.parentNode.removeChild(this.element));
+</xsl:text>
+ <xsl:text> // disable interaction with background
+</xsl:text>
+ <xsl:text> svg_root.addEventListener("pointerdown", numb_event, true);
+</xsl:text>
+ <xsl:text> svg_root.addEventListener("pointerup", numb_event, true);
+</xsl:text>
+ <xsl:text> svg_root.addEventListener("click", this.bound_close_on_click_elsewhere, true);
+</xsl:text>
+ <xsl:text> this.highlight_selection();
+</xsl:text>
+ <xsl:text>
+</xsl:text>
+ <xsl:text> // mark as open
+</xsl:text>
+ <xsl:text> this.opened = true;
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> // Put text element in normalized state
+</xsl:text>
+ <xsl:text> reset_text(){
+</xsl:text>
+ <xsl:text> let txt = this.text_elt;
+</xsl:text>
<xsl:text> let first = txt.firstElementChild;
</xsl:text>
+ <xsl:text> // remove attribute eventually added to first text line while opening
+</xsl:text>
+ <xsl:text> first.onclick = null;
+</xsl:text>
+ <xsl:text> first.removeAttribute("dy");
+</xsl:text>
+ <xsl:text> first.removeAttribute("dx");
+</xsl:text>
+ <xsl:text> // keep only the first line of text
+</xsl:text>
+ <xsl:text> for(let span of Array.from(txt.children).slice(1)){
+</xsl:text>
+ <xsl:text> txt.removeChild(span)
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> // Put rectangle element in saved original state
+</xsl:text>
+ <xsl:text> reset_box(){
+</xsl:text>
+ <xsl:text> let m = this.box_bbox;
+</xsl:text>
+ <xsl:text> let b = this.box_elt;
+</xsl:text>
+ <xsl:text> b.x.baseVal.value = m.x;
+</xsl:text>
+ <xsl:text> b.y.baseVal.value = m.y;
+</xsl:text>
+ <xsl:text> b.width.baseVal.value = m.width;
+</xsl:text>
+ <xsl:text> b.height.baseVal.value = m.height;
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> highlight_selection(){
+</xsl:text>
+ <xsl:text> let highlighted_row = this.last_selection - this.menu_offset;
+</xsl:text>
+ <xsl:text> if(highlighted_row < 0) return;
+</xsl:text>
+ <xsl:text> let spans = this.text_elt.children;
+</xsl:text>
+ <xsl:text> let spanslength = spans.length;
+</xsl:text>
+ <xsl:text> let contentlength = this.content.length;
+</xsl:text>
+ <xsl:text> if(this.menu_offset != 0) {
+</xsl:text>
+ <xsl:text> spanslength--;
+</xsl:text>
+ <xsl:text> highlighted_row++;
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> if(this.menu_offset + spanslength < contentlength - 1) spanslength--;
+</xsl:text>
+ <xsl:text> if(highlighted_row > spanslength) return;
+</xsl:text>
<xsl:text> let original_text_y = this.text_bbox.y;
</xsl:text>
<xsl:text> let highlight = this.highlight_elt;
</xsl:text>
- <xsl:text> let original_h_y = highlight.getBBox().y;
-</xsl:text>
- <xsl:text> let clickable = highlight.cloneNode();
+ <xsl:text> let span = spans[highlighted_row];
</xsl:text>
<xsl:text> let yoffset = span.getBBox().y - original_text_y;
</xsl:text>
- <xsl:text> clickable.setAttribute("y", original_h_y + yoffset);
-</xsl:text>
- <xsl:text> clickable.style.pointerEvents = "bounding-box";
-</xsl:text>
- <xsl:text> clickable.style.visibility = "hidden";
-</xsl:text>
- <xsl:text> //clickable.onclick = () => alert("love JS");
-</xsl:text>
- <xsl:text> clickable.onclick = func;
-</xsl:text>
- <xsl:text> this.element.appendChild(clickable);
-</xsl:text>
- <xsl:text> this.clickables.push(clickable)
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> reset_clickables() {
-</xsl:text>
- <xsl:text> while(this.clickables.length){
-</xsl:text>
- <xsl:text> this.element.removeChild(this.clickables.pop());
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> // Set text content when content is smaller than menu (no scrolling)
-</xsl:text>
- <xsl:text> set_complete_text(){
-</xsl:text>
- <xsl:text> let spans = this.text_elt.children;
-</xsl:text>
- <xsl:text> let c = 0;
-</xsl:text>
- <xsl:text> for(let item of this.content){
-</xsl:text>
- <xsl:text> let span=spans[c];
-</xsl:text>
- <xsl:text> span.textContent = item;
-</xsl:text>
- <xsl:text> let sel = c;
-</xsl:text>
- <xsl:text> this.make_clickable(span, (evt) => this.bound_on_selection_click(sel));
-</xsl:text>
- <xsl:text> c++;
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> // Move partial view :
-</xsl:text>
- <xsl:text> // false : upward, lower value
-</xsl:text>
- <xsl:text> // true : downward, higher value
-</xsl:text>
- <xsl:text> scroll(forward){
-</xsl:text>
- <xsl:text> let contentlength = this.content.length;
-</xsl:text>
- <xsl:text> let spans = this.text_elt.children;
-</xsl:text>
- <xsl:text> let spanslength = spans.length;
-</xsl:text>
- <xsl:text> // reduce accounted menu size according to jumps
-</xsl:text>
- <xsl:text> if(this.menu_offset != 0) spanslength--;
-</xsl:text>
- <xsl:text> if(this.menu_offset < contentlength - 1) spanslength--;
-</xsl:text>
- <xsl:text> if(forward){
-</xsl:text>
- <xsl:text> this.menu_offset = Math.min(
-</xsl:text>
- <xsl:text> contentlength - spans.length + 1,
-</xsl:text>
- <xsl:text> this.menu_offset + spanslength);
-</xsl:text>
- <xsl:text> }else{
-</xsl:text>
- <xsl:text> this.menu_offset = Math.max(
-</xsl:text>
- <xsl:text> 0,
-</xsl:text>
- <xsl:text> this.menu_offset - spanslength);
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> this.reset_clickables();
-</xsl:text>
- <xsl:text> this.set_partial_text();
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> // Setup partial view text content
-</xsl:text>
- <xsl:text> // with jumps at first and last entry when appropriate
-</xsl:text>
- <xsl:text> set_partial_text(){
-</xsl:text>
- <xsl:text> let spans = this.text_elt.children;
-</xsl:text>
- <xsl:text> let contentlength = this.content.length;
-</xsl:text>
- <xsl:text> let spanslength = spans.length;
-</xsl:text>
- <xsl:text> let i = this.menu_offset, c = 0;
-</xsl:text>
- <xsl:text> let m = this.box_bbox;
-</xsl:text>
- <xsl:text> while(c < spanslength){
-</xsl:text>
- <xsl:text> let span=spans[c];
-</xsl:text>
- <xsl:text> let onclickfunc;
-</xsl:text>
- <xsl:text> // backward jump only present if not exactly at start
-</xsl:text>
- <xsl:text> if(c == 0 && i != 0){
-</xsl:text>
- <xsl:text> span.textContent = "▲";
-</xsl:text>
- <xsl:text> onclickfunc = this.bound_on_backward_click;
-</xsl:text>
- <xsl:text> let o = span.getBBox();
-</xsl:text>
- <xsl:text> span.setAttribute("dx", (m.width - o.width)/2);
-</xsl:text>
- <xsl:text> // presence of forward jump when not right at the end
-</xsl:text>
- <xsl:text> }else if(c == spanslength-1 && i < contentlength - 1){
-</xsl:text>
- <xsl:text> span.textContent = "▼";
-</xsl:text>
- <xsl:text> onclickfunc = this.bound_on_forward_click;
-</xsl:text>
- <xsl:text> let o = span.getBBox();
-</xsl:text>
- <xsl:text> span.setAttribute("dx", (m.width - o.width)/2);
-</xsl:text>
- <xsl:text> // otherwise normal content
-</xsl:text>
- <xsl:text> }else{
-</xsl:text>
- <xsl:text> span.textContent = this.content[i];
-</xsl:text>
- <xsl:text> let sel = i;
-</xsl:text>
- <xsl:text> onclickfunc = (evt) => this.bound_on_selection_click(sel);
-</xsl:text>
- <xsl:text> span.removeAttribute("dx");
-</xsl:text>
- <xsl:text> i++;
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> this.make_clickable(span, onclickfunc);
-</xsl:text>
- <xsl:text> c++;
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> open(){
-</xsl:text>
- <xsl:text> let length = this.content.length;
-</xsl:text>
- <xsl:text> // systematically reset text, to strip eventual whitespace spans
-</xsl:text>
- <xsl:text> this.reset_text();
-</xsl:text>
- <xsl:text> // grow as much as needed or possible
-</xsl:text>
- <xsl:text> let slots = this.grow_text(length);
-</xsl:text>
- <xsl:text> // Depending on final size
-</xsl:text>
- <xsl:text> if(slots == length) {
-</xsl:text>
- <xsl:text> // show all at once
-</xsl:text>
- <xsl:text> this.set_complete_text();
-</xsl:text>
- <xsl:text> } else {
-</xsl:text>
- <xsl:text> // eventualy align menu to current selection, compensating for lift
-</xsl:text>
- <xsl:text> let offset = this.last_selection - this.lift;
-</xsl:text>
- <xsl:text> if(offset > 0)
-</xsl:text>
- <xsl:text> this.menu_offset = Math.min(offset + 1, length - slots + 1);
-</xsl:text>
- <xsl:text> else
-</xsl:text>
- <xsl:text> this.menu_offset = 0;
-</xsl:text>
- <xsl:text> // show surrounding values
-</xsl:text>
- <xsl:text> this.set_partial_text();
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> // Now that text size is known, we can set the box around it
-</xsl:text>
- <xsl:text> this.adjust_box_to_text();
-</xsl:text>
- <xsl:text> // Take button out until menu closed
-</xsl:text>
- <xsl:text> this.element.removeChild(this.button_elt);
-</xsl:text>
- <xsl:text> // Rise widget to top by moving it to last position among siblings
-</xsl:text>
- <xsl:text> this.element.parentNode.appendChild(this.element.parentNode.removeChild(this.element));
-</xsl:text>
- <xsl:text> // disable interaction with background
-</xsl:text>
- <xsl:text> svg_root.addEventListener("pointerdown", numb_event, true);
-</xsl:text>
- <xsl:text> svg_root.addEventListener("pointerup", numb_event, true);
-</xsl:text>
- <xsl:text> svg_root.addEventListener("click", this.bound_close_on_click_elsewhere, true);
-</xsl:text>
- <xsl:text> // mark as open
-</xsl:text>
- <xsl:text> this.opened = true;
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> // Put text element in normalized state
-</xsl:text>
- <xsl:text> reset_text(){
-</xsl:text>
- <xsl:text> let txt = this.text_elt;
-</xsl:text>
- <xsl:text> let first = txt.firstElementChild;
-</xsl:text>
- <xsl:text> // remove attribute eventually added to first text line while opening
-</xsl:text>
- <xsl:text> first.onclick = null;
-</xsl:text>
- <xsl:text> first.removeAttribute("dy");
-</xsl:text>
- <xsl:text> first.removeAttribute("dx");
-</xsl:text>
- <xsl:text> // keep only the first line of text
-</xsl:text>
- <xsl:text> for(let span of Array.from(txt.children).slice(1)){
-</xsl:text>
- <xsl:text> txt.removeChild(span)
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> }
-</xsl:text>
- <xsl:text> // Put rectangle element in saved original state
-</xsl:text>
- <xsl:text> reset_box(){
-</xsl:text>
- <xsl:text> let m = this.box_bbox;
-</xsl:text>
- <xsl:text> let b = this.box_elt;
-</xsl:text>
- <xsl:text> b.x.baseVal.value = m.x;
-</xsl:text>
- <xsl:text> b.y.baseVal.value = m.y;
-</xsl:text>
- <xsl:text> b.width.baseVal.value = m.width;
-</xsl:text>
- <xsl:text> b.height.baseVal.value = m.height;
+ <xsl:text> highlight.y.baseVal.value = this.highlight_bbox.y + yoffset;
+</xsl:text>
+ <xsl:text> highlight.style.visibility = "visible";
+</xsl:text>
+ <xsl:text> }
+</xsl:text>
+ <xsl:text> reset_highlight(){
+</xsl:text>
+ <xsl:text> let highlight = this.highlight_elt;
+</xsl:text>
+ <xsl:text> highlight.y.baseVal.value = this.highlight_bbox.y;
+</xsl:text>
+ <xsl:text> highlight.style.visibility = "hidden";
</xsl:text>
<xsl:text> }
</xsl:text>