← Back to branch summary

~ubuntu-branches/ubuntu/precise/classpath/precise

« back to all changes in this revision

Viewing changes to javax/swing/plaf/metal/MetalSliderUI.java

  • Committer: Bazaar Package Importer
  • Author(s): Michael Koch
  • Date: 2006-05-27 16:11:15 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060527161115-h6e39eposdt5snb6
Tags: 2:0.91-3
http://bugs.debian.org/368172
* Install header files to /usr/include/classpath.
* debian/control: classpath: Conflict with jamvm < 1.4.3 and
  cacao < 0.96 (Closes: #368172).

Show diffs side-by-side

added added

removed removed

Lines of Context:
javax/swing/plaf/metal/MetalSliderUI.java
1
1
/* MetalSliderUI.java
2
 
   Copyright (C) 2005 Free Software Foundation, Inc.
 
2
   Copyright (C) 2005, 2006, Free Software Foundation, Inc.
3
3
 
4
4
This file is part of GNU Classpath.
5
5
 
210
210
      {
211
211
        int trackX = trackRect.x;
212
212
        int trackY = trackRect.y + (trackRect.height - getTrackWidth()) / 2;
213
 
        int trackW = trackRect.width - 1;
 
213
        int trackW = trackRect.width;
214
214
        int trackH = getTrackWidth();
215
215
        
216
216
        // draw border
224
224
          }
225
225
 
226
226
        // fill track (if required)
227
 
        if (filledSlider) 
228
 
        {
229
 
          int xPos = xPositionForValue(slider.getValue());
230
 
          int x = (slider.getInverted() ? xPos : trackRect.x);
231
 
          int w = (slider.getInverted() ? trackX + trackW - xPos 
232
 
                  : xPos - trackRect.x);
233
 
          g.setColor(MetalLookAndFeel.getControlShadow());
234
 
          g.fillRect(x + 1, trackY + 1, w - 3, getTrackWidth() - 3);
235
 
          if (slider.isEnabled())
236
 
            {
237
 
              g.setColor(MetalLookAndFeel.getControl());
238
 
              g.drawLine(x + 1, trackY + 1, x + w - 3, trackY + 1);
239
 
              g.drawLine(x + 1, trackY + 1, x + 1, 
240
 
                      trackY + getTrackWidth() - 3);
241
 
            }
242
 
        }
 
227
        if (MetalLookAndFeel.getCurrentTheme() instanceof OceanTheme)
 
228
          {
 
229
            if (slider.isEnabled())
 
230
              {
 
231
                int xPos = xPositionForValue(slider.getValue());
 
232
                int x = (slider.getInverted() ? xPos : trackRect.x);
 
233
                int w = (slider.getInverted() ? trackX + trackW - xPos 
 
234
                                              : xPos - trackRect.x);
 
235
                g.setColor(MetalLookAndFeel.getWhite());
 
236
                g.drawLine(x + 1, trackY + 1, x + w - 3, trackY + 1);
 
237
                g.setColor(UIManager.getColor("Slider.altTrackColor"));
 
238
                g.drawLine(x + 1, trackY + 2, x + w - 3, trackY + 2);
 
239
                g.setColor(MetalLookAndFeel.getControlShadow());
 
240
                g.drawLine(x + 1, trackY + 3, x + w - 3, trackY + 3);
 
241
                g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
 
242
                g.drawLine(x + 1, trackY + 4, x + w - 3, trackY + 4);
 
243
              }
 
244
          }
 
245
        else if (filledSlider) 
 
246
          {
 
247
            int xPos = xPositionForValue(slider.getValue());
 
248
            int x = (slider.getInverted() ? xPos : trackRect.x);
 
249
            int w = (slider.getInverted() ? trackX + trackW - xPos 
 
250
                                          : xPos - trackRect.x);
 
251
            g.setColor(MetalLookAndFeel.getControlShadow());
 
252
            g.fillRect(x + 1, trackY + 1, w - 3, getTrackWidth() - 3);
 
253
            if (slider.isEnabled())
 
254
              {
 
255
                g.setColor(MetalLookAndFeel.getControl());
 
256
                g.drawLine(x + 1, trackY + 1, x + w - 3, trackY + 1);
 
257
                g.drawLine(x + 1, trackY + 1, x + 1, 
 
258
                           trackY + getTrackWidth() - 3);
 
259
              }
 
260
          }
243
261
      }
244
262
    else
245
263
      {
246
264
        int trackX = trackRect.x  + (trackRect.width - getTrackWidth()) / 2;
247
265
        int trackY = trackRect.y;
248
266
        int trackW = getTrackWidth();
249
 
        int trackH = trackRect.height - 1;
 
267
        int trackH = trackRect.height;
250
268
        if (slider.isEnabled())
251
269
          BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH, 
252
270
              darkShadowColor, shadowColor, darkShadowColor, highlightColor);
255
273
            g.setColor(MetalLookAndFeel.getControlShadow());
256
274
            g.drawRect(trackX, trackY, trackW - 2, trackH - 2);
257
275
          }
258
 
        
259
 
        if (filledSlider) 
 
276
 
 
277
        // Fill track if necessary.
 
278
        if (MetalLookAndFeel.getCurrentTheme() instanceof OceanTheme)
 
279
          {
 
280
            if (slider.isEnabled())
 
281
              {
 
282
                int yPos = yPositionForValue(slider.getValue());
 
283
                int y = (slider.getInverted() ? trackY : yPos);
 
284
                int h = (slider.getInverted() ? yPos - trackY 
 
285
                        : trackY + trackH - yPos);
 
286
                
 
287
                g.setColor(MetalLookAndFeel.getWhite());
 
288
                g.drawLine(trackX + 1, y + 1, trackX + 1, y + h - 3);
 
289
                g.setColor(UIManager.getColor("Slider.altTrackColor"));
 
290
                g.drawLine(trackX + 2, y + 1, trackX + 2, y + h - 3);
 
291
                g.setColor(MetalLookAndFeel.getControlShadow());
 
292
                g.drawLine(trackX + 3, y + 1, trackX + 3, y + h - 3);
 
293
                g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
 
294
                g.drawLine(trackX + 4, y + 1, trackX + 4, y + h - 3);
 
295
              }
 
296
          }
 
297
        else if (filledSlider) 
260
298
          {
261
299
          int yPos = yPositionForValue(slider.getValue());
262
300
          int y = (slider.getInverted() ? trackY : yPos);