Skip to content

adds fix for JSGraphics2D.drawDirect (untested) #95

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
BobHanson merged 17 commits into from
Dec 18, 2018
Merged

adds fix for JSGraphics2D.drawDirect (untested) #95

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
110c38e
adds fix for JSGraphics2D.drawDirect (untested)
Dec 16, 2018
933f0b1
Merge pull request #76 from BobHanson/hanson1
BobHanson Dec 16, 2018
10c46c0
JLabel icon/text work - icons now paint properly to main canvas; tables
Dec 16, 2018
0619186
JLabel icon/text work - icons now paint properly to main canvas; tables
Dec 16, 2018
114a89d
unnecessary jquery files moved to unused/
Dec 17, 2018
fccec29
jquery startup check for Oracle explicit
Dec 17, 2018
ef7ed52
aesthetic fix for var i
Dec 17, 2018
cd67c87
working more on button/label ui update
Dec 17, 2018
a88e79c
label centering broken
Dec 17, 2018
7240b14
removing unnec. JTabbedPane2
Dec 17, 2018
8ba8a78
static recent colors for DefaultSwatchChooserPanel.RecentColors
Dec 17, 2018
4cc23b7
minor demo tweak
Dec 17, 2018
b1d285b
adds pixel_ratio idea from stackoverflow, but not implemented
Dec 17, 2018
2f5750d
3.2.4.05 (b) update for broken tab pane, primarily
Dec 17, 2018
da5e964
Fix for occasional JLabel appearing on left of page
Dec 18, 2018
b44fad9
table work
Dec 18, 2018
840fdf9
Merge pull request #77 from BobHanson/hanson1
BobHanson Dec 18, 2018
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
Prev Previous commit
Next Next commit
label centering broken
  • Loading branch information
hansonr authored and hansonr committed Dec 17, 2018
commit a88e79ca9683bed45c06265fd844c021db04f485
9 changes: 3 additions & 6 deletions sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2179,11 +2179,8 @@ protected void setHorizontalButtonAlignments(AbstractButton b, int hTextPos, int
// DOMNode.setAttr(textNode, "innerHTML", pos);


int wIcon = (iconNode == null ? 0 : imageNode == null ? 20 : Math.max(0, setHTMLSize1(iconNode, false, false).width - 1));
if (isMenuItem && actionNode != null)
wIcon = 15;
int wText = setHTMLSize1(textNode, false, false).width - 1;

int wIcon = (actionNode != null ? (isMenuItem ? 15 : 20) : iconNode == null ? 0 : imageNode == null ? 0 : Math.max(0, setHTMLSize1(iconNode, false, false).width - 1));
int wText = setHTMLSize1(textNode, false, false).width - 1;
int gap = (wText == 0 || wIcon == 0 ? 0 : b.getIconTextGap());

// But we need to slightly underestimate it so that the
Expand Down Expand Up @@ -2261,7 +2258,7 @@ protected void setHorizontalButtonAlignments(AbstractButton b, int hTextPos, int
DOMNode.setStyles(domNode, "text-align", alignlr, poslr, px0);
//}
if (centered) {
int w = setHTMLSize1((buttonNode == null ? domNode : centeringNode), false, false).width;
int w = cellComponent != null ? cellWidth : setHTMLSize1((buttonNode == null ? domNode : centeringNode), false, false).width;
switch (hTextPos) {
case SwingConstants.CENTER:
case SwingConstants.TOP:
Expand Down