Skip to content

Commit f9ca11b

Browse files
hansonrhansonr
hansonr
authored and
hansonr
committed
menu fonts/padding correction
1 parent d9c3b03 commit f9ca11b

File tree

7 files changed

+28
-8
lines changed

7 files changed

+28
-8
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181117133327
1+
20181117133636

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181117133327
1+
20181117133636

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

130 Bytes
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,17 @@ try{
5555
_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").andSelf().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},
5656
_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},
5757
_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},
58-
refresh:function(){var t,n=this.options.icons.submenu,r=this.element.find(this.options.menus);r.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),r=t.prev("a"),i=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);r.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",r.attr("id"))}),t=r.add(this.element),t.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),t.children(":not(.ui-menu-item)").each(function(){var t=e(this);/[^\-+�G��G��+�G��G��\s]/.test(t.text())||t.addClass("ui-widget-content ui-menu-divider")}),t.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},
58+
refresh:function(){
59+
var t,n=this.options.icons.submenu,role=this.options.role,
60+
r=this.element.find(this.options.menus);
61+
r.filter(":not(.ui-menu)")
62+
.addClass("ui-menu ui-widget ui-widget-content ui-corner-all")
63+
.hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"})
64+
.each(function(){var t=e(this),r=t.prev("a"),
65+
i=e("<span>").addClass("ui-menu-icon ui-icon "+n)
66+
.attr({role:role})
67+
.data("ui-menu-submenu-carat",!0);
68+
r.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",r.attr("id"))}),t=r.add(this.element),t.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),t.children(":not(.ui-menu-item)").each(function(){var t=e(this);/[^\-+�G��G��+�G��G��\s]/.test(t.text())||t.addClass("ui-widget-content ui-menu-divider")}),t.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},
5969
_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},
6070
focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),r=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",r.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),e&&e.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)&&this._startOpening(n),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},
6171
_scrollIntoView:function(t){var n,r,i,s,o,u;this._hasScroll()&&(n=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,r=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,i=t.offset().top-this.activeMenu.offset().top-n-r,s=this.activeMenu.scrollTop(),o=this.activeMenu.height(),u=t.height(),i<0?this.activeMenu.scrollTop(s+i):i+u>o&&this.activeMenu.scrollTop(s+i-o+u))},

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ protected DOMNode createItem(String type, DOMNode label) {
170170
}
171171

172172
protected void setupButton() {
173-
setPadding(button.getMargin());
173+
if (!isMenuItem)
174+
setPadding(button.getMargin());
174175
setIconAndText("button", (ImageIcon) button.getIcon(), button.getIconTextGap(), button.getText());
175176
// "emptyBorder" is not really empty.
176177
if (button.getBorder() == null || button.getBorder() == BorderFactory.emptyBorder)

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuItemUI.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public DOMNode updateDOMNode() {
2828
}
2929
// add code here for adjustments when changes in bounds or other properties occur.
3030
DOMNode.setVisible(domNode, jc.isVisible());
31+
setupButton();
3132
return domNode;
3233
}
3334

‎sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,16 @@ Container getVisualPaneContent(JMenu menu)
147147
firstColumn.add(rb3);
148148
firstColumn.setBounds(200, 20, 200, 500);
149149

150+
151+
font = new Font("Verdana", Font.PLAIN, 11);
152+
150153
JMenuItem cb3m = new JMenuItem("Xleading,left-to-right");
151154
cb3m.setFont(font);
152155
cb3m.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
153156
cb3m.setHorizontalTextPosition(SwingConstants.LEADING);
154157

155158
JCheckBoxMenuItem cb4m = new JCheckBoxMenuItem("Xleading,right-to-left");
156-
cb4m.setFont(font);
157-
159+
cb4m.setFont(font);
158160
cb4m.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
159161
cb4m.setHorizontalTextPosition(SwingConstants.LEADING);
160162

@@ -225,8 +227,10 @@ public void actionPerformed(ActionEvent e) {
225227
});
226228

227229
JMenu m1 = new JMenu("left");
230+
m1.setFont(font);
228231
m1.addMenuListener(this);
229232
JMenu m2 = new JMenu("right");
233+
m2.setFont(font);
230234
m2.addMenuListener(this);
231235
m1.add(cb4m);
232236
m1.add(cb3m);
@@ -241,8 +245,12 @@ public void actionPerformed(ActionEvent e) {
241245

242246
mb4.addItemListener(this);
243247
menu.add(m1);
244-
menu.add(new JMenuItem("-"));
245-
menu.add(new JMenuItem("testing"));
248+
JMenuItem btn = new JMenuItem("-");
249+
btn.setFont(font);
250+
menu.add(btn);
251+
btn=new JMenuItem("testing");
252+
btn.setFont(font);
253+
menu.add(btn);
246254
menu.add(m2);
247255

248256

0 commit comments

Comments
 (0)