Skip to content

Commit d4b4f74

Browse files
committed
Merge pull request #3 from exxcellent/master
BugFix Patches from ScoPi
2 parents 2b6c05d + 99ff4c0 commit d4b4f74

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

src/client/extras/Sync.Menu.js

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,8 @@ Extras.Sync.Menu.RenderedMenu = Core.extend({
582582
foreground = this.component.render("foreground", Extras.Sync.Menu.DEFAULTS.foreground);
583583
}
584584
Echo.Sync.Color.render(foreground, menuContentDiv, "color");
585+
Echo.Sync.Extent.render(this.component.render("menuWidth"),
586+
menuContentDiv, "width", true, false);
585587

586588
// Apply menu font if it is set, or apply default font
587589
// if it is set and the menu font is NOT set.
@@ -627,6 +629,7 @@ Extras.Sync.Menu.RenderedMenu = Core.extend({
627629

628630
var menuTable = document.createElement("table");
629631
menuTable.style.borderCollapse = "collapse";
632+
menuTable.style.width = "100%";
630633
menuContentDiv.appendChild(menuTable);
631634

632635
var menuTbody = document.createElement("tbody");
@@ -665,6 +668,7 @@ Extras.Sync.Menu.RenderedMenu = Core.extend({
665668
if (hasIcons) {
666669
menuItemIconTd = document.createElement("td");
667670
Echo.Sync.Insets.render(iconPadding, menuItemIconTd, "padding");
671+
Echo.Sync.Extent.render("0px", menuItemIconTd, "width", true, false);
668672
if (item instanceof Extras.ToggleOptionModel) {
669673
var iconIdentifier;
670674
var selected = this.stateModel && this.stateModel.isSelected(item.modelId);
@@ -1180,6 +1184,7 @@ Extras.Sync.DropDownMenu = Core.extend(Extras.Sync.Menu, {
11801184
this._contentDiv.style.whiteSpace = "nowrap";
11811185
}
11821186
Echo.Sync.Insets.render(this.component.render("insets", "2px 5px"), this._contentDiv, "padding");
1187+
Echo.Sync.Font.render(this.component.render("font"), this._contentDiv);
11831188
dropDownDiv.appendChild(this._contentDiv);
11841189

11851190
var clearDiv = document.createElement("div");

0 commit comments

Comments
 (0)