Commit b2d0145b authored by Steve Revill's avatar Steve Revill
Browse files

Bugfix of version 1.98

Detail:
  * Show error message when dragging selection fails.
  * Sprite target area in spritefile window set to a minimum height
    of 64 units and minimum width of 64 units.
  * Moving brush now redrawn in the same place that it is updated.
  * Changed moving brush plotting from EOR to NOT to stop
    black in brushes not appearing.
  * Fixed situation where the moving text y position is different
    to plotted text y position at 1:1 scale.
  * Stopped text redrawing repeatedly at the same place. This makes
    single clicks when using EOR plotting always work as expected.
    (old bug)
  * fixed width of insert/delete display at 1:1 scale.
  * fixed ftrace calls left in from changes that cause the !Debug
    compilation to fail.
  * makefile: changed OBJSZ o.Paintlib and o.AltRename. Changed o. to  oz.
  * makefile: changed OBJSD o.Paintlib and o.AltRename. Changed o. to  od.
Admin:
 Tested on Iyonix RO5.10
 Programmer tested only.
Notes:
  Changed by Colin Granville

Version 1.99. Tagged as 'Paint-1_99'
parent 83811440
......@@ -109,10 +109,10 @@ DFILES = \
OBJS = o.colours o.main o.menus o.psprite o.sprwindow o.tools o.toolwindow \
o.jpeg o.writepixel o.AltRename o.PaintLib
OBJSZ = oz.colours oz.main oz.menus oz.psprite oz.sprwindow\
oz.tools oz.toolwindow o.jpeg o.writepixel o.AltRename o.PaintLib
oz.tools oz.toolwindow o.jpeg o.writepixel oz.AltRename oz.PaintLib
OBJSD = od.colours od.ftrace od.guard od.main od.menus\
od.psprite od.sprwindow od.tools od.toolwindow o.jpeg o.m o.writepixel\
o.AltRename o.PaintLib
od.AltRename od.PaintLib
ASMS = s.colours s.main s.menus s.psprite s.sprwindow s.tools s.toolwindow
INCS = i.colours i.main i.menus i.psprite i.sprwindow i.tools i.toolwindow
......
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.98"
Module_Version SETA 198
Module_MajorVersion SETS "1.99"
Module_Version SETA 199
Module_MinorVersion SETS ""
Module_Date SETS "27 Jul 2007"
Module_ApplicationDate SETS "27-Jul-07"
Module_Date SETS "18 Sep 2007"
Module_ApplicationDate SETS "18-Sep-07"
Module_ComponentName SETS "Paint"
Module_ComponentPath SETS "castle/RiscOS/Sources/Apps/Paint"
Module_FullVersion SETS "1.98"
Module_HelpVersion SETS "1.98 (27 Jul 2007)"
Module_FullVersion SETS "1.99"
Module_HelpVersion SETS "1.99 (18 Sep 2007)"
END
/* (1.98)
/* (1.99)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.2.
*
*/
#define Module_MajorVersion_CMHG 1.98
#define Module_MajorVersion_CMHG 1.99
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 27 Jul 2007
#define Module_Date_CMHG 18 Sep 2007
#define Module_MajorVersion "1.98"
#define Module_Version 198
#define Module_MajorVersion "1.99"
#define Module_Version 199
#define Module_MinorVersion ""
#define Module_Date "27 Jul 2007"
#define Module_Date "18 Sep 2007"
#define Module_ApplicationDate "27-Jul-07"
#define Module_ApplicationDate "18-Sep-07"
#define Module_ComponentName "Paint"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Paint"
#define Module_FullVersion "1.98"
#define Module_HelpVersion "1.98 (27 Jul 2007)"
#define Module_LibraryVersionInfo "1:98"
#define Module_FullVersion "1.99"
#define Module_HelpVersion "1.99 (18 Sep 2007)"
#define Module_LibraryVersionInfo "1:99"
......@@ -749,8 +749,6 @@ static void menus_save_selection (main_window* window)
return;
}
ftracef1 ("sprite called \"%s\"\n", name);
myxfersend (SPRITE_FILE,"Selection",main_selection_file_size(window),main_save_selection,0,0,window);
}
......@@ -913,6 +911,36 @@ static void stop_insdel_graphics (void)
menus_restart_tool ();
}
static void insdel_drawEOR(main_sprite_window* sprw,int x0,int y0)
{
int xmul = sprw->blobsize.scale_xmul*insdel_sprite->mode.scale_xmul;
int xdiv = sprw->blobsize.scale_xdiv;
int ymul = sprw->blobsize.scale_ymul*insdel_sprite->mode.scale_ymul;
int ydiv = sprw->blobsize.scale_ydiv;
os_swi2 (OS_SetColour, 3, -1);
#if 0 /*replace the following to avoid checking for full-palette modes.
J R C 22nd Feb 1994*/
bbc_gcol (3, 127);
bbc_tint (2, 3); /*27 August 1991*/
#endif
if (insdel_rowfield != -1)
{ ftracef0 ("insdel_EOR row\n");
int top=MAX(insdel_row,Row)+1;
int bottom=MIN(insdel_row,Row);
bbc_rectanglefill (MAX (x0, 0), y0 + bottom*ymul/ydiv,
0x1FFF, (top - bottom)*ymul/ydiv-1);
}
if (insdel_colfield != -1)
{ ftracef0 ("insdel_EOR column\n");
int left=MIN(insdel_col,Column);
int right=MAX(insdel_col,Column)+1;
bbc_rectanglefill (x0 + left*xmul/xdiv, MAX (y0, 0),
(right-left)*xmul/xdiv-1, 0x1FFF);
}
}
static void insdel_EOR (void)
{ main_sprite_window *sprw;
......@@ -920,11 +948,7 @@ static void insdel_EOR (void)
ftracef0 ("insdel_EOR\n");
for (sprw = insdel_sprite->windows; sprw != NULL; sprw = sprw->link)
{ int xmul = sprw->blobsize.scale_xmul*insdel_sprite->mode.scale_xmul;
int xdiv = sprw->blobsize.scale_xdiv;
int ymul = sprw->blobsize.scale_ymul*insdel_sprite->mode.scale_ymul;
int ydiv = sprw->blobsize.scale_ydiv;
int more, x0, y0;
{ int more, x0, y0;
wimp_redrawstr rds;
wimp_winfo curr;
......@@ -938,29 +962,8 @@ static void insdel_EOR (void)
y0 = rds.box.y1 - rds.scy + curr.info.ex.y0;
while (more)
{ os_swi2 (OS_SetColour, 3, -1);
#if 0 /*replace the following to avoid checking for full-palette modes.
J R C 22nd Feb 1994*/
bbc_gcol (3, 127);
bbc_tint (2, 3); /*27 August 1991*/
#endif
if (insdel_rowfield != -1)
{ ftracef0 ("insdel_EOR row\n");
int top=MAX(insdel_row,Row)+1;
int bottom=MIN(insdel_row,Row);
bbc_rectanglefill (MAX (x0, 0), y0 + bottom*ymul/ydiv,
0x1FFF, (top - bottom)*ymul/ydiv);
}
if (insdel_colfield != -1)
{ ftracef0 ("insdel_EOR column\n");
int left=MIN(insdel_col,Column);
int right=MAX(insdel_col,Column)+1;
bbc_rectanglefill (x0 + left*xmul/xdiv, MAX (y0, 0),
(right-left)*xmul/xdiv, 0x1FFF);
}
{
insdel_drawEOR(sprw,x0,y0);
wimpt_noerr (wimp_get_rectangle (&rds, &more));
}
}
......@@ -1018,39 +1021,11 @@ static void insdeltool_null (main_window *window, wimp_mousestr *mpos)
static void insdeltool_redraw (main_window *window, int x0, int y0)
{ main_sprite_window *sprw = &window->data->sprite;
{
ftracef0 ("insdeltool_redraw\n");
if (sprw->sprite->needsnull)
{ int xmul = sprw->blobsize.scale_xmul*insdel_sprite->mode.scale_xmul,
xdiv = sprw->blobsize.scale_xdiv,
ymul = sprw->blobsize.scale_ymul*insdel_sprite->mode.scale_ymul,
ydiv = sprw->blobsize.scale_ydiv;
os_swi2 (OS_SetColour, 3, -1);
#if 0 /*replace the following to avoid checking for full-palette modes.
J R C 22nd Feb 1994*/
bbc_gcol (3, 127);
bbc_tint (2, 3); /*27 August 1991*/
#endif
if (insdel_rowfield != -1)
{ ftracef0 ("insdel_EOR row\n");
int top=MAX(insdel_row,Row)+1;
int bottom=MIN(insdel_row,Row);
bbc_rectanglefill (MAX (x0, 0), y0 + bottom*ymul/ydiv,
0x1FFF, (top - bottom)*ymul/ydiv);
}
if (insdel_colfield != -1)
{ ftracef0 ("insdel_EOR column\n");
int left=MIN(insdel_col,Column);
int right=MAX(insdel_col,Column)+1;
bbc_rectanglefill (x0 + left*xmul/xdiv, MAX (y0, 0),
(right-left)*xmul/xdiv, 0x1FFF);
}
}
if (window->data->sprite.sprite->needsnull)
insdel_drawEOR(&window->data->sprite,x0,y0);
}
static void insdeltool_stop (main_sprite *sprite)
......
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