IWMBrowser/iwmlib
IWMBrowser/iwmlib
4
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Revert "highlightColor now set correctly"

Browse Source 
This reverts commit 437320b4ad.
This commit is contained in:
mhalfmann 2019-06-06 15:09:56 +02:00
parent 437320b4ad
commit 502bdf47a3
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/iwmlib.js vendored
View File

@ -6070,7 +6070,6 @@
notchSize = 10, notchSize = 10,
maxWidth = 800, maxWidth = 800,
backgroundColor = '#EEE', backgroundColor = '#EEE',
highlightBackgroundColor = '#EEE',
normalColor = '#444', normalColor = '#444',
highlightColor = 'black', highlightColor = 'black',
notchPosition = 'bottomLeft', notchPosition = 'bottomLeft',
@ -6082,7 +6081,6 @@
this.switchPos = switchPos; this.switchPos = switchPos;
this.spacing = spacing; this.spacing = spacing;
this.highlightColor = highlightColor; this.highlightColor = highlightColor;
this.highlightBackgroundColor = highlightBackgroundColor
} }
/** Setup menu with a dictionary of command labels and command functions. /** Setup menu with a dictionary of command labels and command functions.
@ -6142,7 +6140,6 @@
update(key, highlight = false) { update(key, highlight = false) {
let text = this.items[key]; let text = this.items[key];
text.style.color = (highlight) ? this.highlightColor : this.normalColor; text.style.color = (highlight) ? this.highlightColor : this.normalColor;
text.style.background = (highlight) ? this.highlightBackgroundColor : this.backgroundColor;
} }
/** Mouse over handöer. /** Mouse over handöer.
@ -6200,7 +6197,6 @@
maxWidth = 800, maxWidth = 800,
keepWithin = null, keepWithin = null,
backgroundColor = '#EEE', backgroundColor = '#EEE',
highlightBackgroundColor = '#EEE', highlightColor, highlightBackgroundColor,
normalColor = '#444', normalColor = '#444',
autoClose = true } = {}) { autoClose = true } = {}) {

6
lib/popupmenu.js
View File

@ -31,7 +31,6 @@ export default class PopupMenu extends Popup {
notchSize = 10, notchSize = 10,
maxWidth = 800, maxWidth = 800,
backgroundColor = '#EEE', backgroundColor = '#EEE',
highlightBackgroundColor = '#EEE',
normalColor = '#444', normalColor = '#444',
highlightColor = 'black', highlightColor = 'black',
notchPosition = 'bottomLeft', notchPosition = 'bottomLeft',
@ -43,7 +42,6 @@ export default class PopupMenu extends Popup {
this.switchPos = switchPos this.switchPos = switchPos
this.spacing = spacing this.spacing = spacing
this.highlightColor = highlightColor this.highlightColor = highlightColor
this.highlightBackgroundColor = highlightBackgroundColor
} }
/** Setup menu with a dictionary of command labels and command functions. /** Setup menu with a dictionary of command labels and command functions.
@ -103,7 +101,6 @@ export default class PopupMenu extends Popup {
update(key, highlight = false) { update(key, highlight = false) {
let text = this.items[key] let text = this.items[key]
text.style.color = (highlight) ? this.highlightColor : this.normalColor text.style.color = (highlight) ? this.highlightColor : this.normalColor
text.style.background = (highlight) ? this.highlightBackgroundColor : this.backgroundColor
} }
/** Mouse over handöer. /** Mouse over handöer.
@ -161,7 +158,6 @@ export default class PopupMenu extends Popup {
maxWidth = 800, maxWidth = 800,
keepWithin = null, keepWithin = null,
backgroundColor = '#EEE', backgroundColor = '#EEE',
highlightBackgroundColor = '#EEE',
normalColor = '#444', normalColor = '#444',
autoClose = true } = {}) { autoClose = true } = {}) {
@ -175,7 +171,7 @@ export default class PopupMenu extends Popup {
let popup = new PopupMenu({ let popup = new PopupMenu({
parent, fontSize, padding, zIndex, spacing, switchPos, notchSize, parent, fontSize, padding, zIndex, spacing, switchPos, notchSize,
notchPosition, notchPosition,
maxWidth, backgroundColor, normalColor, highlightColor, highlightBackgroundColor, maxWidth, backgroundColor, normalColor,
notchPosition, keepWithin, autoClose notchPosition, keepWithin, autoClose
}) })
popup.showAt(commands, point) popup.showAt(commands, point)