clip/unclip problem in JViewport causing JTable paint issues

BobHanson · BobHanson · commit d85d930c6a1f · 2020-03-18T10:33:09.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JViewport.java b/sources/net.sf.j2s.java.core/src/javax/swing/JViewport.java
@@ -1626,19 +1626,21 @@ private void blitDoubleBuffered(JComponent view, Graphics g,
      * @param g the <code>Graphics</code> context within which to paint
      */
     private void paintView(Graphics g) {
-        Rectangle clip = g.getClipBounds();
         JComponent view = (JComponent)getView();
 
         if (view.getWidth() >= getWidth()) {
             // Graphics is relative to JViewport, need to map to view's
             // coordinates space.
             int x = view.getX();
             int y = view.getY();
+            Rectangle clip = g.getClipBounds();
             g.translate(x, y);
-            g.setClip(clip.x - x, clip.y - y, clip.width, clip.height);
-            view.paintForceDoubleBuffered(g);
+            Graphics g1 = g.create();
+            g1.setClip(clip.x - x, clip.y - y, clip.width, clip.height);
+            view.paintForceDoubleBuffered(g1);
+            g1.dispose();
             g.translate(-x, -y);
-            g.setClip(clip.x, clip.y, clip.width, clip.height);
+            //g.setClip(clip.x, clip.y, clip.width, clip.height);
         }
         else {
             // To avoid any problems that may result from the viewport being
