This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 48137
Collapse All | Expand All

(-)ToolbarPool.java (-8 / +26 lines)
Lines 18-23 Link Here
18
import java.awt.Color;
18
import java.awt.Color;
19
import java.awt.Container;
19
import java.awt.Container;
20
import java.awt.FlowLayout;
20
import java.awt.FlowLayout;
21
import java.awt.Toolkit;
21
import java.awt.event.*;
22
import java.awt.event.*;
22
import java.util.*;
23
import java.util.*;
23
24
Lines 117-130 Link Here
117
        getAccessibleContext().setAccessibleDescription(instance.instanceName());
118
        getAccessibleContext().setAccessibleDescription(instance.instanceName());
118
119
119
        if (UIManager.getLookAndFeel() instanceof com.sun.java.swing.plaf.windows.WindowsLookAndFeel) {
120
        if (UIManager.getLookAndFeel() instanceof com.sun.java.swing.plaf.windows.WindowsLookAndFeel) {
120
            //Set up custom borders for XP
121
            if( isXPTheme() ) {
121
            setBorder(BorderFactory.createCompoundBorder(
122
                //Set up custom borders for XP
122
                upperBorder, 
123
                setBorder(BorderFactory.createCompoundBorder(
123
                BorderFactory.createCompoundBorder(
124
                    upperBorder, 
124
                    BorderFactory.createMatteBorder(0, 0, 1, 0, 
125
                    BorderFactory.createCompoundBorder(
125
                    fetchColor("controlShadow", Color.DARK_GRAY)),
126
                        BorderFactory.createMatteBorder(0, 0, 1, 0, 
126
                    BorderFactory.createMatteBorder(0, 0, 1, 0, mid))
127
                        fetchColor("controlShadow", Color.DARK_GRAY)),
127
            )); //NOI18N
128
                        BorderFactory.createMatteBorder(0, 0, 1, 0, mid))
129
                )); //NOI18N
130
            } else {
131
                setBorder( BorderFactory.createEtchedBorder() );
132
            }
128
        }
133
        }
129
    }
134
    }
130
    
135
    
Lines 382-387 Link Here
382
        }
387
        }
383
        return accessibleContext;
388
        return accessibleContext;
384
    }
389
    }
390
391
    /** Recognizes if XP theme is set.
392
     * @return true if XP theme is set, false otherwise
393
     */
394
    private static Boolean isXP = null;
395
    private static boolean isXPTheme () {
396
        if (isXP == null) {
397
            Boolean xp = (Boolean)Toolkit.getDefaultToolkit().
398
            getDesktopProperty("win.xpstyle.themeActive"); //NOI18N
399
            isXP = Boolean.TRUE.equals(xp)? Boolean.TRUE : Boolean.FALSE;
400
        }
401
        return isXP.booleanValue();
402
    }    
385
403
386
    /**
404
    /**
387
     * This class is used for delayed setting of configuration after instance
405
     * This class is used for delayed setting of configuration after instance
(-)Toolbar.java (-1 / +1 lines)
Lines 803-809 Link Here
803
803
804
        /** Create new ToolbarGrip for default number of grip elements. */
804
        /** Create new ToolbarGrip for default number of grip elements. */
805
        public ToolbarGrip () {
805
        public ToolbarGrip () {
806
            this (2);
806
            this (1);
807
        }
807
        }
808
808
809
        /** Create new ToolbarGrip for specific number of grip elements.
809
        /** Create new ToolbarGrip for specific number of grip elements.

Return to bug 48137