Skip to content

BugFix Patches from ScoPi #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2012
Merged

BugFix Patches from ScoPi #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe84c1c
Extras.DropDownMenu menuWidth property support
bentolor Feb 27, 2012
99ff4c0
Extras.DropDownMenu font rendering
bentolor Feb 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/client/extras/Sync.Menu.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,8 @@ Extras.Sync.Menu.RenderedMenu = Core.extend({
foreground = this.component.render("foreground", Extras.Sync.Menu.DEFAULTS.foreground);
}
Echo.Sync.Color.render(foreground, menuContentDiv, "color");
Echo.Sync.Extent.render(this.component.render("menuWidth"),
menuContentDiv, "width", true, false);

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

var menuTable = document.createElement("table");
menuTable.style.borderCollapse = "collapse";
menuTable.style.width = "100%";
menuContentDiv.appendChild(menuTable);

var menuTbody = document.createElement("tbody");
Expand Down Expand Up @@ -665,6 +668,7 @@ Extras.Sync.Menu.RenderedMenu = Core.extend({
if (hasIcons) {
menuItemIconTd = document.createElement("td");
Echo.Sync.Insets.render(iconPadding, menuItemIconTd, "padding");
Echo.Sync.Extent.render("0px", menuItemIconTd, "width", true, false);
if (item instanceof Extras.ToggleOptionModel) {
var iconIdentifier;
var selected = this.stateModel && this.stateModel.isSelected(item.modelId);
Expand Down Expand Up @@ -1180,6 +1184,7 @@ Extras.Sync.DropDownMenu = Core.extend(Extras.Sync.Menu, {
this._contentDiv.style.whiteSpace = "nowrap";
}
Echo.Sync.Insets.render(this.component.render("insets", "2px 5px"), this._contentDiv, "padding");
Echo.Sync.Font.render(this.component.render("font"), this._contentDiv);
dropDownDiv.appendChild(this._contentDiv);

var clearDiv = document.createElement("div");
Expand Down