krysalis-jplugin/src/java/org/krysalis/swingx/laf/flat FlatButtonUI.java,1.1,1.2 FlatSplitPaneDivider.java,1.1,1.2 FlatScrollBarUI.java,1.1,1.2 FlatScrollButton.java,1.1,1.2 FlatTabbedPaneUI.java,1.2,1.3
[email protected] Mon, 29 Sep 2003 08:54:16 -0700
Newsgroups
gmane.comp.krysalis.metamorphosis.cvs
Message-ID
<[email protected] >
Update of /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/laf/flat
In directory sc8-pr-cvs1:/tmp/cvs-serv3380/src/java/org/krysalis/swingx/laf/flat
Modified Files:
FlatButtonUI.java FlatSplitPaneDivider.java
FlatScrollBarUI.java FlatScrollButton.java
FlatTabbedPaneUI.java
Log Message:
Last round of Logging fixes and other small code tweak.
Compiles but will not ye work, as dependencies are also in the
component descriptor.
Will fix later.
Index: FlatButtonUI.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/laf/flat/FlatButtonUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlatButtonUI.java 29 Sep 2003 15:02:13 -0000 1.1
--- FlatButtonUI.java 29 Sep 2003 15:54:14 -0000 1.2
***************
*** 20,23 ****
--- 20,25 ----
import javax.swing.border.*;
import javax.swing.plaf.basic.*;
+ import javax.swing.plaf.metal.MetalLookAndFeel;
+
import java.awt.*;
import java.awt.event.*;
***************
*** 81,85 ****
public void installDefaults(AbstractButton b) {
super.installDefaults(b);
! Border outerBorder = BorderFactory.createLineBorder(FlatLookAndFeel.getControlShadow(), 1);
Border innerBorder = BorderFactory.createEmptyBorder(2, 2, 2, 2);
b.setBorder(BorderFactory.createCompoundBorder(outerBorder, innerBorder));
--- 83,87 ----
public void installDefaults(AbstractButton b) {
super.installDefaults(b);
! Border outerBorder = BorderFactory.createLineBorder(MetalLookAndFeel.getControlShadow(), 1);
Border innerBorder = BorderFactory.createEmptyBorder(2, 2, 2, 2);
b.setBorder(BorderFactory.createCompoundBorder(outerBorder, innerBorder));
Index: FlatSplitPaneDivider.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/laf/flat/FlatSplitPaneDivider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlatSplitPaneDivider.java 29 Sep 2003 15:02:13 -0000 1.1
--- FlatSplitPaneDivider.java 29 Sep 2003 15:54:14 -0000 1.2
***************
*** 19,22 ****
--- 19,23 ----
import javax.swing.plaf.basic.BasicSplitPaneDivider;
import javax.swing.plaf.basic.BasicSplitPaneUI;
+ import javax.swing.plaf.metal.MetalLookAndFeel;
/**
***************
*** 33,38 ****
private int inset = 2;
! private Color controlColor = FlatLookAndFeel.getControl();
! private Color primaryControlColor = FlatLookAndFeel.getPrimaryControl();
--- 34,39 ----
private int inset = 2;
! private Color controlColor = MetalLookAndFeel.getControl();
! private Color primaryControlColor = MetalLookAndFeel.getPrimaryControl();
***************
*** 113,117 ****
* }
*/
! g.setColor(FlatLookAndFeel.getBlack());
if (orientation == JSplitPane.VERTICAL_SPLIT) {
// Draw the image for a vertical split
--- 114,118 ----
* }
*/
! g.setColor(MetalLookAndFeel.getBlack());
if (orientation == JSplitPane.VERTICAL_SPLIT) {
// Draw the image for a vertical split
***************
*** 199,203 ****
* }
*/
! g.setColor(FlatLookAndFeel.getBlack());
if (orientation == JSplitPane.VERTICAL_SPLIT) {
// Draw the image for a vertical split
--- 200,204 ----
* }
*/
! g.setColor(MetalLookAndFeel.getBlack());
if (orientation == JSplitPane.VERTICAL_SPLIT) {
// Draw the image for a vertical split
Index: FlatScrollBarUI.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/laf/flat/FlatScrollBarUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlatScrollBarUI.java 29 Sep 2003 15:02:13 -0000 1.1
--- FlatScrollBarUI.java 29 Sep 2003 15:54:14 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
+ import java.awt.Adjustable;
import java.awt.Color;
import java.awt.Dimension;
***************
*** 23,26 ****
--- 24,28 ----
import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicScrollBarUI;
+ import javax.swing.plaf.metal.MetalLookAndFeel;
***************
*** 81,85 ****
*/
public Dimension getPreferredSize(JComponent c) {
! if (scrollbar.getOrientation() == JScrollBar.VERTICAL) {
return new Dimension(scrollBarWidth, scrollBarWidth * 3 + 10);
} else {
--- 83,87 ----
*/
public Dimension getPreferredSize(JComponent c) {
! if (scrollbar.getOrientation() == Adjustable.VERTICAL) {
return new Dimension(scrollBarWidth, scrollBarWidth * 3 + 10);
} else {
***************
*** 181,185 ****
g.translate(trackBounds.x, trackBounds.y);
! g.setColor(FlatLookAndFeel.getBlack());
//g.drawRect(1,1,trackBounds.x-2,trackBounds.y-2);
--- 183,187 ----
g.translate(trackBounds.x, trackBounds.y);
! g.setColor(MetalLookAndFeel.getBlack());
//g.drawRect(1,1,trackBounds.x-2,trackBounds.y-2);
***************
*** 259,263 ****
g.translate(thumbBounds.x, thumbBounds.y);
! if (scrollbar.getOrientation() == JScrollBar.VERTICAL) {
g.setColor(thumbColor);
g.drawRect(2, 2, thumbBounds.width - 4, thumbBounds.height - 4);
--- 261,265 ----
g.translate(thumbBounds.x, thumbBounds.y);
! if (scrollbar.getOrientation() == Adjustable.VERTICAL) {
g.setColor(thumbColor);
g.drawRect(2, 2, thumbBounds.width - 4, thumbBounds.height - 4);
Index: FlatScrollButton.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/laf/flat/FlatScrollButton.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlatScrollButton.java 29 Sep 2003 15:02:13 -0000 1.1
--- FlatScrollButton.java 29 Sep 2003 15:54:14 -0000 1.2
***************
*** 14,17 ****
--- 14,18 ----
import javax.swing.UIManager;
import javax.swing.plaf.basic.BasicArrowButton;
+ import javax.swing.plaf.metal.MetalLookAndFeel;
/**
***************
*** 115,119 ****
boolean isEnabled = getParent().isEnabled();
! Color arrowColor = FlatLookAndFeel.getBlack();
boolean isPressed = getModel().isPressed();
int width = getWidth();
--- 116,120 ----
boolean isEnabled = getParent().isEnabled();
! Color arrowColor = MetalLookAndFeel.getBlack();
boolean isPressed = getModel().isPressed();
int width = getWidth();
***************
*** 128,132 ****
if (isPressed) {
! g.setColor(FlatLookAndFeel.getControlShadow());
g.fillRect(3, 3, width - 5, height - 5);
--- 129,133 ----
if (isPressed) {
! g.setColor(MetalLookAndFeel.getControlShadow());
g.fillRect(3, 3, width - 5, height - 5);
Index: FlatTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/laf/flat/FlatTabbedPaneUI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FlatTabbedPaneUI.java 29 Sep 2003 15:38:52 -0000 1.2
--- FlatTabbedPaneUI.java 29 Sep 2003 15:54:14 -0000 1.3
***************
*** 17,31 ****
*
*/
! import javax.swing.plaf.basic.BasicHTML;
! import javax.swing.*;
! import javax.swing.event.*;
! import javax.swing.plaf.*;
! import javax.swing.text.View;
!
! import java.awt.*;
! import java.awt.event.*;
! import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import java.util.Vector;
/**
* A Basic L&F implementation of TabbedPaneUI.
--- 17,64 ----
*
*/
! import java.awt.Color;
! import java.awt.Component;
! import java.awt.Container;
! import java.awt.Dimension;
! import java.awt.Font;
! import java.awt.FontMetrics;
! import java.awt.Graphics;
! import java.awt.Insets;
! import java.awt.LayoutManager;
! import java.awt.Rectangle;
! import java.awt.Toolkit;
! import java.awt.event.ActionEvent;
! import java.awt.event.ContainerEvent;
! import java.awt.event.ContainerListener;
! import java.awt.event.FocusAdapter;
! import java.awt.event.FocusEvent;
! import java.awt.event.FocusListener;
! import java.awt.event.MouseAdapter;
! import java.awt.event.MouseEvent;
! import java.awt.event.MouseListener;
import java.beans.PropertyChangeEvent;
+ import java.beans.PropertyChangeListener;
import java.util.Vector;
+
+ import javax.swing.AbstractAction;
+ import javax.swing.ActionMap;
+ import javax.swing.BorderFactory;
+ import javax.swing.Icon;
+ import javax.swing.InputMap;
+ import javax.swing.JComponent;
+ import javax.swing.JTabbedPane;
+ import javax.swing.KeyStroke;
+ import javax.swing.LookAndFeel;
+ import javax.swing.SwingConstants;
+ import javax.swing.SwingUtilities;
+ import javax.swing.UIManager;
+ import javax.swing.event.ChangeEvent;
+ import javax.swing.event.ChangeListener;
+ import javax.swing.plaf.ActionMapUIResource;
+ import javax.swing.plaf.ComponentUI;
+ import javax.swing.plaf.TabbedPaneUI;
+ import javax.swing.plaf.basic.BasicHTML;
+ import javax.swing.plaf.metal.MetalLookAndFeel;
+ import javax.swing.text.View;
/**
* A Basic L&F implementation of TabbedPaneUI.
***************
*** 942,951 ****
Rectangle textRect, boolean isSelected) {
textRect.x = textRect.y = iconRect.x = iconRect.y = 0;
! SwingUtilities.layoutCompoundLabel((JComponent) tabPane,
metrics, title, icon,
! SwingUtilities.CENTER,
! SwingUtilities.CENTER,
! SwingUtilities.CENTER,
! SwingUtilities.TRAILING,
tabRect,
iconRect,
--- 975,984 ----
Rectangle textRect, boolean isSelected) {
textRect.x = textRect.y = iconRect.x = iconRect.y = 0;
! SwingUtilities.layoutCompoundLabel( tabPane,
metrics, title, icon,
! SwingConstants.CENTER,
! SwingConstants.CENTER,
! SwingConstants.CENTER,
! SwingConstants.TRAILING,
tabRect,
iconRect,
***************
*** 1166,1170 ****
boolean isSelected) {
//g.setColor(tabPane.getBackgroundAt(tabIndex));
! g.setColor(FlatLookAndFeel.getControl());
switch (tabPlacement) {
--- 1199,1203 ----
boolean isSelected) {
//g.setColor(tabPane.getBackgroundAt(tabIndex));
! g.setColor(MetalLookAndFeel.getControl());
switch (tabPlacement) {
***************
*** 2563,2567 ****
pastRect.x = rects[j - 1].x + rects[j - 1].width;
}
! pastRect.width += Math.round((float) pastRect.width * factor);
}
lastRect.width = max - lastRect.x;
--- 2596,2600 ----
pastRect.x = rects[j - 1].x + rects[j - 1].width;
}
! pastRect.width += Math.round( pastRect.width * factor);
}
lastRect.width = max - lastRect.x;
***************
*** 2576,2580 ****
pastRect.y = rects[j - 1].y + rects[j - 1].height;
}
! pastRect.height += Math.round((float) pastRect.height * factor);
}
lastRect.height = max - lastRect.y;
--- 2609,2613 ----
pastRect.y = rects[j - 1].y + rects[j - 1].height;
}
! pastRect.height += Math.round( pastRect.height * factor);
}
lastRect.height = max - lastRect.y;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf