Skip to content

Commit

Permalink
UI: Fix statusbar position indicators causing UI to jump - fixes #1536
Browse files Browse the repository at this point in the history
rn=

(integrated from master branch change 9.2.1-1637-g83e26b4 by Nathan Rijksen <n.rijksen@gmail.com>)
  • Loading branch information
Naatan committed May 19, 2016
1 parent 30adbb4 commit 8209119
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
14 changes: 8 additions & 6 deletions src/chrome/komodo/content/bindings/views-editor.p.xml
Expand Up @@ -60,13 +60,15 @@
</xul:deck>
</xul:statusbarpanel>

<xul:statusbarpanel anonid="statusbar-line-col"
<xul:statusbarpanel anonid="statusbar-pos-info"
tooltiptext="&filePosition.tooltiptext;"
align="center"/>
<xul:statusbarpanel anonid="statusbar-selection"
label="&noSelection.label;"
tooltiptext="&selectionInformation.tooltiptext;"
align="center"/>
align="center"
pack="end">

<xul:label anonid="statusbar-selection"/>
<xul:label anonid="statusbar-line-col"/>

</xul:statusbarpanel>

<xul:statusbarpanel anonid="statusbar-encoding"
style="min-width: 5rem"
Expand Down
4 changes: 2 additions & 2 deletions src/chrome/komodo/content/statusbar.p.js
Expand Up @@ -229,7 +229,7 @@ function _updateSelectionInformation(view) {
}
var xv = getXulView(view);
var selectionWidget = xv.findAnonymous('anonid', "statusbar-selection").element();
selectionWidget.label = selectionLabel;
selectionWidget.value = selectionLabel;
selectionWidget.removeAttribute("collapsed");
}

Expand All @@ -249,7 +249,7 @@ function _updateLineCol(view, currentLine, currentColumn) {
var lineColText = lazy.bundle.formatStringFromName("lineColCount.label",
[currentLine, currentColumn], 2);
var lineColWidget = xv.findAnonymous('anonid', 'statusbar-line-col').element();
lineColWidget.setAttribute('label', lineColText);
lineColWidget.setAttribute('value', lineColText);
lineColWidget.removeAttribute("collapsed");
} catch(ex) {
// not a view that supports these
Expand Down
5 changes: 5 additions & 0 deletions src/chrome/komodo/skin/global/main.less
Expand Up @@ -350,6 +350,11 @@ statusbar
{
opacity: 0.6;
}

statusbarpanel[anonid="statusbar-pos-info"]
{
min-width: 200px;
}
}

&[classic-statusbar="true"]
Expand Down

0 comments on commit 8209119

Please sign in to comment.