evl_upd20151125c.diff

Reworked auto-scroll - Eugenie Lyzenko, 11/25/2015 06:06 PM

     **                  GUI mode ignoring SESSION:DATA-ENTRY-RETURN value.  The combo-box does not
     **                  react to the ENTER key in GUI.  Key processsing fixes for GUI mode.
     ** 014 EVL 20151120 Fix for drop-down line spacing issue. And fix for button incorrect drawing
     **                  over 3d border.
     **                  over 3d border.  Drop-down button fix for pressed state drawing.  Pressing
     **                  the drop-down button need to be painted accordingly.
     */
     package com.goldencode.p2j.ui.client.gui;
-...
+          {
              requestFocus();
              pressed = true;
              // drop-down is opening on mouse press
              if (config.mode != ComboBoxConfig.Mode.SIMPLE)
+             {
                 // first need to display the button pressing effect
                 ThinClient.getInstance().independentEventDrawingBracket(this, new Runnable()
+                {
                    public void run()
+                   {
                       repaint();
+                   }
                 });
                 // depending on current state activate or dismiss drop-down
                 if (dropDownActive)
+                {
                    // second click to drop-down button or area dismisses the active drop-down

     ** 010 EVL 20151010 Fix for thumb drawing issues. Also reworked image loader specifically for
     **                  small images.  Optimization for button painting on mouse press, release.  In
     **                  these cases we do not need to repaint whole window.
     ** 011 EVL 20151124 The button pressed state needs repaint() call to properly display pressed mode
     **                  when running indide drop-down life cycle.  Improved mouse handling, in 4GL
     **                  if to press mouse, move inside button and release - this generates click.  So
     **                  we have to track the mouse release, not click.  Adding auto-scroll feature on
     **                  press and hold mouse button.  The mouse executor shoule be stopped on widget
     **                  destroy to free the resources.  Changing static executor to be instance based.
     */
     package com.goldencode.p2j.ui.client.gui;
-...
     // this usage of AWT events is intentional, they are being used separately from the
     // AWT/Swing event model itself; no other AWT/Swing usage is occurring in this class
     import java.awt.event.MouseEvent;
     import java.util.concurrent.*;
     import com.goldencode.p2j.ui.*;
     import com.goldencode.p2j.ui.chui.ThinClient;
     import com.goldencode.p2j.ui.client.*;
     import com.goldencode.p2j.ui.client.event.*;
     import com.goldencode.p2j.ui.client.ScrollBar.Orientation;
     import com.goldencode.p2j.ui.client.ScrollBar.Position;
     import com.goldencode.p2j.ui.client.gui.driver.*;
-...
        private ImageWrapper<?> img_d;
        /** Button state */
        boolean up = true;
        private volatile boolean up = true;
        /** Executor for handling mouse input. */
        private ExecutorService mouseInputExecutor = Executors.newSingleThreadExecutor();
        /**
         * This constructor creates a scroll bar button.
+        *
-...
+       }
        /**
         * Notification of a mouse clicked event occurred for this widget.
+        *
         * @param    e
         *           The mouse event.
         */
        @Override
        public void mouseClicked(MouseEvent e)
+       {
           // check if the scrollbar widget is enabled
           if (owner.isEnabled())
+          {
              // call scroll bar
              owner.onButtonClick(position, false);
+          }
+       }
        /**
         * Notification of a mouse pressed event occurred for this widget.
+        *
         * @param    e
-...
           if (owner.isEnabled())
+          {
              up = false;
              refresh();
              // need to use repaint() here instead of refresh() because for example inside combo-box
              // drop-down standalone event loop the screen synchronization is not happening
              repaint();
              // for holding mouse we need to genereate scroll events
              mouseInputExecutor.execute(new Runnable()
+             {
                 @Override
                 public void run()
+                {
                    // finisho on mouse release
                    while (!up)
+                   {
                       try
+                      {
                          // wait to see if the mouse is still pressed
                          Thread.sleep(GuiConstants.REPEAT_MILLIS);
                          if (!up)
+                         {
                             // emit the sequential scroll events
                             ThinClient.getInstance().eventDrawingBracket(owner, new Runnable()
+                            {
                                public void run()
+                               {
                                   // emit new scroll event
                                   ScrollEvent evt =
                                      ((ScrollBarGuiImpl)owner).createAutoScrollEvent(position);
                                   EventManager.postEvent(evt);
+                               }
                             });
+                         }
+                      }
                       catch (InterruptedException ex)
+                      {
                          // nop
+                      }
+                   }
+                }
              });
+          }
+       }
-...
           if (owner.isEnabled())
+          {
              up = true;
              refresh();
              repaint();
              // call scroll bar
              owner.onButtonClick(position, false);
+          }
+       }
        /**
         * Destroy this widget.  Cleans up all including widgets before destruction.
         */
        @Override
        public void destroy()
+       {
           // stop the mouse related thread if it is active
           if (!mouseInputExecutor.isShutdown())
+          {
              mouseInputExecutor.shutdownNow();
+          }
           // call superclass for main destruction
           super.destroy();
+       }
        /**
         * Refresh the scrollbar button not repainting full window.
         */
        @Override

     ** 018 SVL 20151029 Added support for scroll bar controllers.
     **     EVL 20151111 Fix for scrollbar thumb size calculation. The minimum size is 8.  When nothing
     **                  to scroll - it is not required to draw the thumb.  Fix for background drawing.
     ** 019 EVL 20151125 Adding executor shutdown to prevent resource leak.  Changing static executor
     **                  to be instance based.
     */
     package com.goldencode.p2j.ui.client.gui;
-...
        public static final int SCROLLBAR_SIZE = 16;
        /** Executor for handling mouse input. */
        private static ExecutorService mouseInputExecutor = Executors.newSingleThreadExecutor();
        private ExecutorService mouseInputExecutor = Executors.newSingleThreadExecutor();
        /** Screen driver */
        private GuiDriver gd;
-...
+       }
        /**
         * Destroy this widget.  Cleans up all including widgets before destruction.
         */
        @Override
        public void destroy()
+       {
           // stop the mouse related thread if it is active
           if (!mouseInputExecutor.isShutdown())
+          {
              mouseInputExecutor.shutdownNow();
+          }
           // call superclass for main destruction
           super.destroy();
+       }
        /**
         * Create GUI specific auto-scroll event.
+        *
         * @param   btn
         *          The source button that caused the event.
         */
        public ScrollEvent createAutoScrollEvent(Position btn)
+       {
           // start with the current position
           int newPos = position;
           if (btn == ScrollBar.Position.RIGHT)
+          {
              newPos += shortStep;
+          }
           else
+          {
              newPos -= shortStep;
+          }
           return createScrollEvent(newPos);
+       }
        /**
         * Get size of the travel area available for thumb scrolling.
+        *
         * @return size of travel area, in pixels.

Project

General

Profile

FWD » Core Development » User Interface

evl_upd20151125c.diff