Changeset 87

Timestamp:

26/12/07 13:49:38 (1 year ago)

Author:

altglass

Message:

AntiAliasing? improvement (notably for Playtree). SubBitmap? editing improved.

Files:

• trunk/src/vlcskineditor/Main.java (modified) (1 diff)
• trunk/src/vlcskineditor/PreviewWindow.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Playtree.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Slider.java (modified) (2 diffs)
• trunk/src/vlcskineditor/items/Text.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/SubBitmap.java (modified) (7 diffs)
• trunk/src/vlcskineditor/resources/SubBitmapEditWindow.java (modified) (5 diffs)

trunk/src/vlcskineditor/Main.java

@@ -48 +48 @@
-  
-  //The version identification of the current build.   
-6.1.b
+7.0.a
-  //The directory in which the VLC executable is found
-  String vlc_dir = "";

trunk/src/vlcskineditor/PreviewWindow.java

@@ -118 +118 @@
-    BufferedImage bi = (BufferedImage) createImage(getWidth(),getHeight());    
-    Graphics2D g2d = bi.createGraphics();
+    g2d.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
-    g2d.setColor(Color.WHITE);
-    g2d.fillRect(0,0,getWidth(),getHeight());

trunk/src/vlcskineditor/items/Playtree.java

@@ -638 +638 @@
-    FontMetrics fm = g.getFontMetrics();
-    if(!bgimage.equals("none")) {
-
+.getSubimage(0, 0, width, height)
-    }
-    else {      

trunk/src/vlcskineditor/items/Slider.java

@@ -542 +542 @@
-    draw(g,0,0);
-  }
-
+    
-    if(!created) return;
-    offsetx=x_;
@@ -555 +555 @@
-    Point2D.Float p = b.getPoint(s.gvars.getSliderValue());
-    g.drawImage(si,(int)p.getX()+x+x_-si.getWidth()/2,(int)p.getY()+y+y_-si.getHeight()/2,null);
-        
+
-      g.setColor(Color.RED);
-      for(float f=0f;f<=1f;f=f+0.1f) {

trunk/src/vlcskineditor/items/Text.java

@@ -415 +415 @@
-        f = new Font(Font.SANS_SERIF,Font.PLAIN,12);
-      }      
-
-
+
-    g.setFont(f);
-    g.setColor(Color.decode(color));

trunk/src/vlcskineditor/resources/SubBitmap.java

@@ -108 +108 @@
-      nbframes=Integer.parseInt(nbframes_tf.getText());
-      fps=Integer.parseInt(fps_tf.getText());   
-f
+JF
-      updateImage();
-      s.updateResources();
@@ -124 +124 @@
-      nbframes=Integer.parseInt(nbframes_tf.getText());
-      fps=Integer.parseInt(fps_tf.getText());   
-f
+JF
-      updateImage();
-      s.updateResources();
@@ -135 +135 @@
-      frame.setResizable(false);
-      frame.setLayout(new FlowLayout());
-f
+JF
-      JLabel id_l = new JLabel("ID*:");
-      id_tf = new JTextField();
@@ -190 +190 @@
-      bounds.add(height_tf);
-      x_l.setBounds(5,15,75,24);
-
+      
-      y_l.setBounds(5,45,75,24);
-      y_tf.setBounds(85,45,150,24);
@@ -239 +239 @@
-    frame.setVisible(true);    
-    sbew = new SubBitmapEditWindow(parent,this);    
+    x_tf.addKeyListener(sbew);
+    y_tf.addKeyListener(sbew);
+    width_tf.addKeyListener(sbew);
+    height_tf.addKeyListener(sbew);
+    frame.addWindowListener(sbew);
-  }
-  public void actionPerformed(ActionEvent e) {
@@ -260 +265 @@
-        return;
-      }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-      update();      
-    }
@@ -283 +294 @@
-    else if(e.getSource().equals(cancel_btn)) {
-      frame.setVisible(false);
-
-
-
+
-      if(!created) parent.SubBitmaps.remove(this);      
-    }
+  }
+  public void destroyEditWindow() {
+    sbew.frame.setVisible(false);
+    x_tf.removeKeyListener(sbew);
+    y_tf.removeKeyListener(sbew);
+    width_tf.removeKeyListener(sbew);
+    height_tf.removeKeyListener(sbew);
+    frame.removeWindowListener(sbew);
+    sbew.frame = null;
+    sbew = null;
-  }
-  public String returnCode() {

trunk/src/vlcskineditor/resources/SubBitmapEditWindow.java

@@ -32 +32 @@
- * @author Daniel Dreibrodt
- */
-
+, KeyListener, WindowListener
-  
-  public JFrame frame;
@@ -43 +43 @@
-  int x1_org, y1_org, x2_org, y2_org;
-  int maxx, maxy;
+  int drawcount;
-  
-  
@@ -69 +70 @@
-    addMouseMotionListener(this);
-  }
-
+
+
-    if(b.image==null) return;
+    if(drawcount>=40) drawcount = 0;
-    g.clearRect(0,0,getWidth(),getHeight());
-    g.drawImage(b.image,0,0,frame);
@@ -84 +87 @@
-    y[2] = y2;
-    y[3] = y2;
-
+
+
+
-  }
+  @Override
-  public void update(Graphics g) {
-    paint(g);
@@ -139 +145 @@
-  }
-  public void mouseExited(MouseEvent e) {
+  }   
+  public void updateDimensions() {
+    if(!starteddragging) {
+      try {
+        x1 = Integer.parseInt(sb.x_tf.getText());
+        x2 = x1 + Integer.parseInt(sb.width_tf.getText());
+        y1 = Integer.parseInt(sb.y_tf.getText());
+        y2 = y1 + Integer.parseInt(sb.height_tf.getText()); 
+      }
+      catch(NumberFormatException ex) {
+        /*empty*/
+      }
+    }
+  }
+  public void keyTyped(KeyEvent e) {    
+  }
+  public void keyPressed(KeyEvent e) {
+    updateDimensions();
+  }
+  public void keyReleased(KeyEvent e) {
+    updateDimensions();
+  }
+  public void windowOpened(WindowEvent e) {    
+  }
+  public void windowClosing(WindowEvent e) {
+    sb.destroyEditWindow();
+  }
+  public void windowClosed(WindowEvent e) {
+  }
+  public void windowIconified(WindowEvent e) {
+  }
+  public void windowDeiconified(WindowEvent e) {
+  }
+  public void windowActivated(WindowEvent e) {
+  }
+  public void windowDeactivated(WindowEvent e) {
-  }
-}