Commit 5dea1612 authored by ROOL's avatar ROOL 🤖
Browse files

Fix for multiple column text area scaling

Detail:
  With the D option for more than 1 column, text areas need the handler for scaling,
  which was removed in Draw-1_39. Put it back.
Admin:
  From an investigation by David Pitt.
  Ref https://www.riscosopen.org/forum/forums/4/topics/16556

Version 1.42. Tagged as 'Draw-1_42'
parent 99383d21
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "1.41"
Module_Version SETA 141
Module_MajorVersion SETS "1.42"
Module_Version SETA 142
Module_MinorVersion SETS ""
Module_Date SETS "25 Apr 2020"
Module_ApplicationDate SETS "25-Apr-20"
Module_Date SETS "28 Jul 2021"
Module_ApplicationDate SETS "28-Jul-21"
Module_ComponentName SETS "Draw"
Module_FullVersion SETS "1.41"
Module_HelpVersion SETS "1.41 (25 Apr 2020)"
Module_FullVersion SETS "1.42"
Module_HelpVersion SETS "1.42 (28 Jul 2021)"
END
/* (1.41)
/* (1.42)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.41
#define Module_MajorVersion_CMHG 1.42
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Apr 2020
#define Module_Date_CMHG 28 Jul 2021
#define Module_MajorVersion "1.41"
#define Module_Version 141
#define Module_MajorVersion "1.42"
#define Module_Version 142
#define Module_MinorVersion ""
#define Module_Date "25 Apr 2020"
#define Module_Date "28 Jul 2021"
#define Module_ApplicationDate "25-Apr-20"
#define Module_ApplicationDate "28-Jul-21"
#define Module_ComponentName "Draw"
#define Module_FullVersion "1.41"
#define Module_HelpVersion "1.41 (25 Apr 2020)"
#define Module_LibraryVersionInfo "1:41"
#define Module_FullVersion "1.42"
#define Module_HelpVersion "1.42 (28 Jul 2021)"
#define Module_LibraryVersionInfo "1:42"
......@@ -940,6 +940,22 @@ static void scale_textarea (draw_objptr hdrptr, scale_typ *scale)
}
}
static void scale_textcolumn (draw_objptr hdrptr, scale_typ *scale)
{ draw_objptr parent = draw_text_findParent (hdrptr.textcolp);
/*Save undo on the parent*/
full_set_undo (scale->diag, parent);
scale_check (hdrptr, scale, NULL);
/*Do the scaling*/
scale_textC (hdrptr, scale);
/*Recalculate parent bbox*/
draw_text_rebound (parent);
}
static void scale_trfmtext (draw_objptr hdrptr, scale_typ *scale)
{ double
......@@ -1097,7 +1113,7 @@ static despatch_tab scaletab[3] =
{ 0 /*fontlist*/, scale_text, scale_pathB,
0 /*rect*/, 0 /*elli*/, scale_sprite,
scale_group, 0 /*tagged*/, 0 /*'8'*/,
scale_textarea, 0 /*textcolumn*/, 0 /*option*/,
scale_textarea, scale_textcolumn, 0 /*option*/,
scale_trfmtext, scale_trfmsprite, 0,
0, scale_jpeg
},
......@@ -1106,7 +1122,7 @@ static despatch_tab scaletab[3] =
{ 0 /*fontlist*/, scale_text, scale_pathBL,
0 /*rect*/, 0 /*elli*/, scale_sprite,
scale_group, 0 /*tagged*/, 0 /*'8'*/,
scale_textarea, 0 /*textcolumn*/, 0 /*option*/,
scale_textarea, scale_textcolumn, 0 /*option*/,
scale_trfmtext, scale_trfmsprite, 0,
0, scale_jpeg
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment