/[debian]/libjgoodies-looks-java/trunk/debian/patches/02_windows.patch
ViewVC logotype

Diff of /libjgoodies-looks-java/trunk/debian/patches/02_windows.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1381 by gregoa, Fri Jul 25 19:07:03 2008 UTC revision 1467 by gregoa, Sun Oct 19 18:28:23 2008 UTC
# Line 1585  Description: remove windows look Line 1585  Description: remove windows look
1585  - * For the latter see also issue #4337647 in Sun's bug database.  - * For the latter see also issue #4337647 in Sun's bug database.
1586  - *  - *
1587  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
1588  - * @version $Revision: 1.10 $  - * @version $Revision: 1.12 $
1589  - *  - *
1590  - */  - */
1591  -final class WindowsFieldCaret extends DefaultCaret implements UIResource {  -final class WindowsFieldCaret extends DefaultCaret implements UIResource {
# Line 1610  Description: remove windows look Line 1610  Description: remove windows look
1610  -            setVisible(true);  -            setVisible(true);
1611  -            setSelectionVisible(true);  -            setSelectionVisible(true);
1612  -        }  -        }
1613  -        if (!c.isEditable()) {  -        if (   !c.isEnabled()
1614    -            || !isKeyboardFocusEvent
1615    -            || !Options.isSelectOnFocusGainActive(c)) {
1616  -            return;  -            return;
1617  -        }  -        }
1618  -        if (   c.isEnabled()  -        if (c instanceof JFormattedTextField) {
1619  -                && isKeyboardFocusEvent  -            EventQueue.invokeLater(new Runnable() {
1620  -                && Options.isSelectOnFocusGainActive(c)) {  -                public void run() {
1621  -            if (c instanceof JFormattedTextField) {  -                    selectAll();
1622  -                EventQueue.invokeLater(new Runnable() {  -                }
1623  -                    public void run() {  -            });
1624  -                        selectAll();  -        } else {
1625  -                    }  -            selectAll();
 -                });  
 -            } else {  
 -                selectAll();  
 -            }  
1626  -        }  -        }
1627  -    }  -    }
1628  -  -
# Line 1707  Description: remove windows look Line 1705  Description: remove windows look
1705  -  -
1706  -        public void run() {  -        public void run() {
1707  -            JTextField field = (JTextField) getComponent();  -            JTextField field = (JTextField) getComponent();
1708  -            if (field != null) {  -            if (field == null) {
1709  -                TextUI ui = field.getUI();  -                return;
1710  -                int dot = getDot();  -            }
1711  -                // PENDING: We need to expose the bias in DefaultCaret.  -            TextUI ui = field.getUI();
1712  -                Position.Bias bias = Position.Bias.Forward;  -            int dot = getDot();
1713  -                Rectangle startRect = null;  -            // PENDING: We need to expose the bias in DefaultCaret.
1714  -                try {  -            Position.Bias bias = Position.Bias.Forward;
1715  -                    startRect = ui.modelToView(field, dot, bias);  -            Rectangle startRect = null;
1716  -                } catch (BadLocationException ble) {}  -            try {
1717    -                startRect = ui.modelToView(field, dot, bias);
1718    -            } catch (BadLocationException ble) {}
1719  -  -
1720  -                Insets i = field.getInsets();  -            Insets i = field.getInsets();
1721  -                BoundedRangeModel vis = field.getHorizontalVisibility();  -            BoundedRangeModel vis = field.getHorizontalVisibility();
1722  -                int x = r.x + vis.getValue() - i.left;  -            int x = r.x + vis.getValue() - i.left;
1723  -                int quarterSpan = vis.getExtent() / 4;  -            int quarterSpan = vis.getExtent() / 4;
1724  -                if (r.x < i.left) {  -            if (r.x < i.left) {
1725  -                    vis.setValue(x - quarterSpan);  -                vis.setValue(x - quarterSpan);
1726  -                } else if (r.x + r.width > i.left + vis.getExtent()) {  -            } else if (r.x + r.width > (i.left + vis.getExtent()+1)) {
1727  -                    vis.setValue(x - (3 * quarterSpan));  -                vis.setValue(x - (3 * quarterSpan));
 -                }  
 -                // If we scroll, our visual location will have changed,  
 -                // but we won't have updated our internal location as  
 -                // the model hasn't changed. This checks for the change,  
 -                // and if necessary, resets the internal location.  
 -                if (startRect != null) {  
 -                    try {  
 -                        Rectangle endRect;  
 -                        endRect = ui.modelToView(field, dot, bias);  
 -                        if (endRect != null && !endRect.equals(startRect)){  
 -                            damage(endRect);  
 -                        }  
 -                    } catch (BadLocationException ble) {}  
 -                }  
1728  -            }  -            }
1729    -            // If we scroll, our visual location will have changed,
1730    -            // but we won't have updated our internal location as
1731    -            // the model hasn't changed. This checks for the change,
1732    -            // and if necessary, resets the internal location.
1733    -            if (startRect == null) {
1734    -                return;
1735    -            }
1736    -            try {
1737    -                Rectangle endRect;
1738    -                endRect = ui.modelToView(field, dot, bias);
1739    -                if (endRect != null && !endRect.equals(startRect)){
1740    -                    damage(endRect);
1741    -                }
1742    -            } catch (BadLocationException ble) {}
1743  -        }  -        }
1744  -  -
1745  -        private final Rectangle r;  -        private final Rectangle r;
# Line 5102  Description: remove windows look Line 5102  Description: remove windows look
5102  -}  -}
5103  --- a/src/core/com/jgoodies/looks/windows/WindowsTextFieldUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsTextFieldUI.java
5104  +++ /dev/null  +++ /dev/null
5105  @@ -1,70 +0,0 @@  @@ -1,81 +0,0 @@
5106  -/*  -/*
5107  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
5108  - *  - *
# Line 5135  Description: remove windows look Line 5135  Description: remove windows look
5135  -  -
5136  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
5137  -  -
5138    -import java.awt.Dimension;
5139    -
5140  -import javax.swing.JComponent;  -import javax.swing.JComponent;
5141  -import javax.swing.plaf.ComponentUI;  -import javax.swing.plaf.ComponentUI;
5142  -import javax.swing.text.Caret;  -import javax.swing.text.Caret;
# Line 5146  Description: remove windows look Line 5148  Description: remove windows look
5148  - * focus traversal.  - * focus traversal.
5149  - *  - *
5150  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
5151  - * @version $Revision: 1.5 $  - * @version $Revision: 1.6 $
5152  - */  - */
5153  -public final class WindowsTextFieldUI extends  -public final class WindowsTextFieldUI extends
5154  -        com.sun.java.swing.plaf.windows.WindowsTextFieldUI {  -        com.sun.java.swing.plaf.windows.WindowsTextFieldUI {
# Line 5172  Description: remove windows look Line 5174  Description: remove windows look
5174  -    }  -    }
5175  -  -
5176  -  -
5177    -    /**
5178    -     * The WindowsFieldCaret requires an extra pixel width.
5179    -     */
5180    -    public Dimension getPreferredSize(JComponent c) {
5181    -        Dimension dim = super.getPreferredSize(c);
5182    -        return new Dimension(dim.width + 1, dim.height);
5183    -    }
5184    -
5185    -
5186  -}  -}
5187  --- a/src/core/com/jgoodies/looks/windows/WindowsToolBarSeparatorUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsToolBarSeparatorUI.java
5188  +++ /dev/null  +++ /dev/null
# Line 6340  Description: remove windows look Line 6351  Description: remove windows look
6351  -  -
6352  -}  -}
6353  \ No newline at end of file  \ No newline at end of file
 Binary files a/src/core/com/jgoodies/looks/windows/icons/Computer.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/DetailsView.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/Directory.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/FavoriteFolder.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/File.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/FloppyDrive.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/HardDrive.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/HomeFolder.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/ListView.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/NewFolder.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/TreeClosed.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/TreeLeaf.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/TreeOpen.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/UpFolder.gif and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/xp/Error.png and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/xp/Inform.png and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/xp/TreeClosed.png and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/xp/TreeOpen.png and /dev/null differ  
 Binary files a/src/core/com/jgoodies/looks/windows/icons/xp/Warn.png and /dev/null differ  
6354  --- a/src/core/com/jgoodies/looks/windows/package.html  --- a/src/core/com/jgoodies/looks/windows/package.html
6355  +++ /dev/null  +++ /dev/null
6356  @@ -1,65 +0,0 @@  @@ -1,65 +0,0 @@

Legend:
Removed from v.1381  
changed lines
  Added in v.1467

  ViewVC Help
Powered by ViewVC 1.1.26