gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-11 18:55:48 +01:00
Code Issues Projects Releases Wiki Activity

Sizing hacks for REPL modes.

Browse Source
This commit is contained in:
Kris Maglione
2011-10-04 00:43:02 -04:00
parent 64df9d9740
commit f1e4e9958c
6 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/content/commandline.js
View File

@@ -290,9 +290,8 @@ var CommandWidgets = Class("CommandWidgets", {
}),
multilineOutput: Class.Memoize(function () this._whenReady("dactyl-multiline-output", function (elem) {
elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true);
elem.contentDocument.documentElement.id = "dactyl-multiline-output-top";
elem.contentDocument.body.id = "dactyl-multiline-output-content";
elem.contentWindow.addEventListener("beforeunload", function (event) { event.preventDefault(); }, true);
highlight.highlightNode(elem.contentDocument.body, "MOW");
}), true),
multilineInput: Class.Memoize(function () document.getElementById("dactyl-multiline-input")),
@@ -609,6 +608,8 @@ var CommandLine = Module("commandline", {
util.waitFor(bind(this.widgets._ready, null, elem));
node.completionList = ItemList(elem);
node.completionList.isAboveMow = node.id ==
this.widgets.statusbar.commandline.id
}
return node.completionList;
},
@@ -1912,8 +1913,11 @@ var ItemList = Class("ItemList", {
root.style.minWidth = document.getElementById("dactyl-commandline").scrollWidth + "px";
let { minHeight } = this;
this.minHeight = Math.max(this.minHeight,
this.win.scrollY + DOM(completions).rect.bottom);
if (mow.visible && this.isAboveMow) // Kludge.
minHeight -= mow.wantedHeight;
let needed = this.win.scrollY + DOM(completions).rect.bottom;
this.minHeight = Math.max(minHeight, needed);
if (!this.visible)
root.style.minWidth = "";
@@ -2090,7 +2094,8 @@ var ItemList = Class("ItemList", {
? this.maxItems / 2 : 0);
}
let range = ItemList.Range(Math.max(0, start - start % 2), Math.min(this.itemCount, end));
let range = ItemList.Range(Math.max(0, start - start % 2),
Math.min(this.itemCount, end));
let first;
for (let [i, row] in this.context.getRows(this.generatedRange.start,

11
common/content/mappings.js
View File

@@ -128,13 +128,10 @@ var Map = Class("Map", {
if (this.names[0] != ".") // FIXME: Kludge.
mappings.repeat = repeat;
if (this.executing) {
if (args.keypressEvents[0].isMacro) {
util.dumpStack(_("map.recursive", args.command));
throw FailedAssertion(_("map.recursive", args.command));
}
this.executing = false;
}
if (this.executing)
util.assert(!args.keypressEvents[0].isMacro,
_("map.recursive", args.command),
false);
try {
this.preExecute(args);

11
common/content/mow.js
View File

@@ -252,10 +252,13 @@ var MOW = Module("mow", {
doc.body.style.minWidth = this.widgets.commandbar.commandline.scrollWidth + "px";
this.widgets.mowContainer.height = Math.min(doc.body.clientHeight, availableHeight) + "px";
this.timeout(function ()
this.widgets.mowContainer.height = Math.min(doc.body.clientHeight, availableHeight) + "px",
0);
function adjust() {
let wantedHeight = doc.body.clientHeight;
this.widgets.mowContainer.height = Math.min(wantedHeight, availableHeight) + "px",
this.wantedHeight = Math.max(0, wantedHeight - availableHeight);
}
adjust.call(this);
this.timeout(adjust);
doc.body.style.minWidth = "";