Browse Source

More work on fixing GTK colours.

Change-Id: I03c2050748ddfe3c4776ae41b6e72dd48f02885e
Reviewed-on: http://gerrit.dmdirc.com/1403
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.4
Greg Holmes 14 years ago
parent
commit
338449f407

+ 2
- 0
src/com/dmdirc/addons/ui_swing/components/TitlePanel.java View File

81
         title.setFont(title.getFont().deriveFont((float) (title.getFont().
81
         title.setFont(title.getFont().deriveFont((float) (title.getFont().
82
                 getSize() * 1.5)));
82
                 getSize() * 1.5)));
83
         title.setForeground(Color.BLACK);
83
         title.setForeground(Color.BLACK);
84
+        title.setBackground(Color.WHITE);
84
 
85
 
85
         add(title, "grow, push");
86
         add(title, "grow, push");
86
         setBorder(border);
87
         setBorder(border);
87
         setBackground(Color.WHITE);
88
         setBackground(Color.WHITE);
89
+        setForeground(Color.BLACK);
88
     }
90
     }
89
 
91
 
90
     /**
92
     /**

+ 5
- 0
src/com/dmdirc/addons/ui_swing/components/ToolTipPanel.java View File

81
         this.icon = new JLabel(IconManager.getIconManager().getIcon("warning"));
81
         this.icon = new JLabel(IconManager.getIconManager().getIcon("warning"));
82
 
82
 
83
         setBackground(Color.WHITE);
83
         setBackground(Color.WHITE);
84
+        setForeground(Color.BLACK);
84
         setBorder(BorderFactory.createEtchedBorder());
85
         setBorder(BorderFactory.createEtchedBorder());
85
 
86
 
86
         tooltip = new TextLabel();
87
         tooltip = new TextLabel();
96
     protected void reset() {
97
     protected void reset() {
97
         SimpleAttributeSet sas = new SimpleAttributeSet();
98
         SimpleAttributeSet sas = new SimpleAttributeSet();
98
 
99
 
100
+        StyleConstants.setForeground(sas, Color.BLACK);
101
+        StyleConstants.setBackground(sas, Color.WHITE);
99
         if (warning == null || warning.isEmpty()) {
102
         if (warning == null || warning.isEmpty()) {
100
             tooltip.setText(defaultHelp);
103
             tooltip.setText(defaultHelp);
101
             icon.setVisible(false);
104
             icon.setVisible(false);
126
         icon.setVisible(false);
129
         icon.setVisible(false);
127
         SimpleAttributeSet sas = new SimpleAttributeSet();
130
         SimpleAttributeSet sas = new SimpleAttributeSet();
128
         StyleConstants.setItalic(sas, false);
131
         StyleConstants.setItalic(sas, false);
132
+        StyleConstants.setForeground(sas, Color.BLACK);
133
+        StyleConstants.setBackground(sas, Color.WHITE);
129
         tooltip.getDocument().setParagraphAttributes(0, text.length(), sas, true);
134
         tooltip.getDocument().setParagraphAttributes(0, text.length(), sas, true);
130
     }
135
     }
131
 
136
 

Loading…
Cancel
Save