Changeset 97 for trunk/gui/shared

Timestamp:

Feb 19, 2023, 2:33:51 AM (3 years ago)

Author:

Alex Taylor

Message:

Various updates and refactoring of font scaling logic; documentation and WIS updates.

Location:

trunk/gui/shared

Files:

• PrManUtl.VRS (modified) (3 diffs)
• PrintUtl.VRS (modified) (6 diffs)

trunk/gui/shared/PrManUtl.VRS

@@ -229 +229 @@
             RETURN 0
 
-        ADDRESS CMD '@UNLOCK' driver '2>NUL 1>NUL'
-        ADDRESS CMD '@EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
+        ADDRESS CMD '@ UNLOCK' driver '2>NUL 1>NUL'
+        ADDRESS CMD '@ EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
     END
 RETURN 1
@@ -350 +350 @@
     IF VRFileExists( newdrvdir'\'eafile ) THEN
         CALL VRDeleteFile newdrvdir'\'eafile
-    ADDRESS CMD '@EAUTIL' newdrvdir'\'drv_name newdrvdir'\'eafile '/s /p 2>NUL 1>NUL'
+    ADDRESS CMD '@ EAUTIL' newdrvdir'\'drv_name newdrvdir'\'eafile '/s /p 2>NUL 1>NUL'
 
 RETURN 1
@@ -1186 +1186 @@
 RETURN success
 
+
+/*:VRX         GetScalingFactor
+ */
+/* Return the UI scaling factor based on the difference between the specified
+ * font size and the design-default font size.
+ */
+GetScalingFactor: PROCEDURE EXPOSE globals.
+    PARSE ARG newSize, orgSize
+
+    IF orgSize == '' THEN
+        orgSize = globals.!defaultSize
+
+    IF newSize < globals.!defaultSize THEN
+        newSize = globals.!defaultSize
+
+    scaleFactor = newSize / orgSize
+
+RETURN scaleFactor
+
+
+/*:VRX         ParseFontSize
+ */
+ParseFontSize: PROCEDURE EXPOSE globals.
+    PARSE ARG font
+    IF font == '' | font == '<default>' THEN
+        RETURN globals.!defaultSize
+
+    PARSE VAR font _pts'.'.
+    IF _pts < globals.!defaultSize THEN
+        _pts = globals.!defaultSize
+
+RETURN _pts
+
+
+/*:VRX         RescaleObject
+ */
+RescaleObject: PROCEDURE
+    PARSE ARG object, factor, move
+
+    x = VRGet( object, 'Left')
+    y = VRGet( object, 'Top')
+    w = VRGet( object, 'Width')
+    h = VRGet( object, 'Height')
+    nx = TRUNC( x * factor )
+    ny = TRUNC( y * factor  )
+    nw = TRUNC( w * factor )
+    nh = TRUNC( h * factor  )
+
+    /* SAY object ': ('||x','y','w','h') --> ('nx','ny','nw','nh')' */
+
+    IF move <> 0 THEN DO
+        ok = VRSet( object, 'Left', nx )
+        ok = VRSet( object, 'Top', ny )
+    END
+    ok = VRSet( object, 'Width', nw )
+    ok = VRSet( object, 'Height', nh )
+
+RETURN
+
+
 /*:VRX         StringTokenize
 */

trunk/gui/shared/PrintUtl.VRS

@@ -17 +17 @@
  */
 GetDriverSource: PROCEDURE EXPOSE globals. pmdx
+    /* Can replace with   PrManUtl */
     ARG driver
     IF driver == '' THEN RETURN ''
@@ -80 +81 @@
  */
 GetDriverPMDD: PROCEDURE
+    /* Can remove */
     PARSE ARG driver, prdrv_lst
 
@@ -101 +103 @@
  */
 VerifyDriverEAs: PROCEDURE EXPOSE globals.
+    /* Can replace with PrManUtl */
     PARSE ARG driver
     eas.0 = 0
@@ -111 +114 @@
             RETURN 0
 
-        ADDRESS CMD '@UNLOCK' driver '2>NUL 1>NUL'
-        ADDRESS CMD '@EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
+        ADDRESS CMD '@ UNLOCK' driver '2>NUL 1>NUL'
+        ADDRESS CMD '@ EAUTIL' driver ea_file '/j /p 2>NUL 1>NUL'
     END
 RETURN 1
@@ -130 +133 @@
  */
 CopyDriverToSource: PROCEDURE EXPOSE globals.
+    /* Can replace with CopyDriverFiles from PrManUtl */
     PARSE ARG driver, newdrvdir
 
@@ -716 +720 @@
 RETURN success
 
+/*:VRX         GetScalingFactor
+*/
+/* Return the UI scaling factor based on the difference between the specified
+ * font size and the design-default font size.
+ */
+GetScalingFactor: PROCEDURE EXPOSE globals.
+    PARSE ARG newSize, orgSize
+
+    IF orgSize == '' THEN
+        orgSize = globals.!defaultSize
+
+    IF newSize < globals.!defaultSize THEN
+        newSize = globals.!defaultSize
+
+    scaleFactor = newSize / orgSize
+
+RETURN scaleFactor
+
+/*:VRX         ParseFontSize
+*/
+ParseFontSize: PROCEDURE EXPOSE globals.
+    PARSE ARG font
+    IF font == '' | font == '<default>' THEN
+        RETURN globals.!defaultSize
+
+    PARSE VAR font _pts'.'.
+    IF _pts < globals.!defaultSize THEN
+        _pts = globals.!defaultSize
+
+RETURN _pts
+
+/*:VRX         RescaleObject
+*/
+RescaleObject: PROCEDURE
+    PARSE ARG object, factor, move
+
+    x = VRGet( object, 'Left')
+    y = VRGet( object, 'Top')
+    w = VRGet( object, 'Width')
+    h = VRGet( object, 'Height')
+    nx = TRUNC( x * factor )
+    ny = TRUNC( y * factor  )
+    nw = TRUNC( w * factor )
+    nh = TRUNC( h * factor  )
+
+    /* SAY object ': ('||x','y','w','h') --> ('nx','ny','nw','nh')' */
+
+    IF move <> 0 THEN DO
+        ok = VRSet( object, 'Left', nx )
+        ok = VRSet( object, 'Top', ny )
+    END
+    ok = VRSet( object, 'Width', nw )
+    ok = VRSet( object, 'Height', nh )
+
+RETURN
+