Revert

Normand Briere

2019-11-07 dbbcbd6f6bd5b9c6eb194130ab471045faaf4955

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
public class cButton extends javax.swing.JButton
{
    String iconname;
    boolean fit;
    
    cButton(String name)
    {
        super(name);
        
        //setBorder(new javax.swing.border.EmptyBorder(0,0,0,0));
        setBorder(new javax.swing.border.EtchedBorder());
    }
    
    cButton(String name, boolean border)
    {
        super(name);
        
        setMargin(new java.awt.Insets(1, -1, 1, -1));
        
        if (border)
                setBorder(new javax.swing.border.EtchedBorder());
        else
        {
                //setBorder(null); //new javax.swing.border.EmptyBorder(0,0,0,0));
        }
    }
    
    cButton(//javax.swing.ImageIcon icon,
            String iconname,
            boolean border, boolean fit)
    {
        //super(icon);
        this.iconname = iconname;
        this.fit = fit;
        
        assert(border);
        
        //setMargin(new java.awt.Insets(1, 10, 1, 10)); // ??
        
//        if (icon != null && fit)
//            this.image = icon.getImage();
        
//result = new JButton( icon );
//result.setBorderPainted( false );
//result.setContentAreaFilled( false );
//
//width = icon.getIconWidth();
//height = icon.getIconHeight();
//result.setPreferredSize( new Dimension( width, height ) );
        if (border)
                setBorder(new javax.swing.border.EtchedBorder());
        else
        {
                //setBorder(null); //new javax.swing.border.EmptyBorder(0,0,0,0));
        }
    }
    
    private java.awt.Image image;
 
    //@Override
    protected void paintComponent(java.awt.Graphics g)
    {
        if (iconname != null)
        {
            javax.swing.ImageIcon icon = ObjEditor.GetIcon(iconname);
 
            if (icon == null)
                setName(iconname);
            else
            {
                if (fit)
                    this.image = icon.getImage();
                else
                    setIcon(icon);
            }
            
            iconname = null;
        }
        
        if (image != null)
        {
            //if (getWidth() > image.getWidth(null) + 8)
            {
                g.drawImage(image, 0,0, this.getWidth()-1, this.getHeight()-1, this);
            }
        }
        else
            super.paintComponent(g);
    }
}