Commit bfb09d9e authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Adjust dragging to drive icons no longer attempts to reference a deleted dir viewer.

In the case of adjust dragging from one dir viewer to another it is safe to call CloseInitiatingDir because the operation is handled entirely internally. In the case of adjust dragging to a drive icon the dir viewer must be kept until after the next wimp poll so that the selection can be retrieved and the copy operation started.
DelViews.s: made the stack frame a bit more reasonably sized
GoFiler.s: removed some unused messages from the message list
MsgsIn.s: removed the corresponding dead switch

Version 2.29. Tagged as 'Filer-2_29'
parent d5a32e17
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "2.28" Module_MajorVersion SETS "2.29"
Module_Version SETA 228 Module_Version SETA 229
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "26 Oct 2011" Module_Date SETS "12 Nov 2011"
Module_ApplicationDate SETS "26-Oct-11" Module_ApplicationDate SETS "12-Nov-11"
Module_ComponentName SETS "Filer" Module_ComponentName SETS "Filer"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Filer" Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Filer"
Module_FullVersion SETS "2.28" Module_FullVersion SETS "2.29"
Module_HelpVersion SETS "2.28 (26 Oct 2011)" Module_HelpVersion SETS "2.29 (12 Nov 2011)"
END END
/* (2.28) /* (2.29)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 2.28 #define Module_MajorVersion_CMHG 2.29
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Oct 2011 #define Module_Date_CMHG 12 Nov 2011
#define Module_MajorVersion "2.28" #define Module_MajorVersion "2.29"
#define Module_Version 228 #define Module_Version 229
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "26 Oct 2011" #define Module_Date "12 Nov 2011"
#define Module_ApplicationDate "26-Oct-11" #define Module_ApplicationDate "12-Nov-11"
#define Module_ComponentName "Filer" #define Module_ComponentName "Filer"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Filer" #define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Filer"
#define Module_FullVersion "2.28" #define Module_FullVersion "2.29"
#define Module_HelpVersion "2.28 (26 Oct 2011)" #define Module_HelpVersion "2.29 (12 Nov 2011)"
#define Module_LibraryVersionInfo "2:28" #define Module_LibraryVersionInfo "2:29"
...@@ -102,14 +102,14 @@ DeleteWindow EntryS "r0, r1" ...@@ -102,14 +102,14 @@ DeleteWindow EntryS "r0, r1"
LDR r0, [sp, #Proc_RegOffset] ; Thank you Mr. Window Manager LDR r0, [sp, #Proc_RegOffset] ; Thank you Mr. Window Manager
10 SUB sp, sp, #256 ; Temp frame 10 SUB sp, sp, #u_windowstate ; Temp frame
MOV r1, sp MOV r1, sp
STR r0, [r1, #u_handle] STR r0, [r1, #u_handle]
[ debugredraw [ debugredraw
DREG r0,"deleting window ",,Integer DREG r0,"deleting window ",,Integer
] ]
SWI XWimp_DeleteWindow ; Which does implicit CloseWindow SWI XWimp_DeleteWindow ; Which does implicit CloseWindow
ADD sp, sp, #256 ADD sp, sp, #u_windowstate
EXITS VC EXITS VC
STR r0, [sp, #Proc_RegOffset] STR r0, [sp, #Proc_RegOffset]
......
...@@ -148,7 +148,7 @@ file_drag ROUT ; NOENTRY ...@@ -148,7 +148,7 @@ file_drag ROUT ; NOENTRY
MOVNE r1, #Action_Copying MOVNE r1, #Action_Copying
MOVEQ r1, #Action_Moving MOVEQ r1, #Action_Moving
[ OptionsAreInRAM [ OptionsAreInRAM
LDRB r2, fileraction_options LDRB r2, fileraction_options
| |
BL ExtractCMOSOptions BL ExtractCMOSOptions
] ]
...@@ -395,8 +395,7 @@ SendSelectionToWindow ...@@ -395,8 +395,7 @@ SendSelectionToWindow
] ]
60 CMP r5, #Nowt 60 CMP r5, #Nowt
BEQ %FT90 ; [finished] BEQ %FT92 ; [finished]
;BEQ %FT92
[ debugtask [ debugtask
DLINE "Found selection" DLINE "Found selection"
......
...@@ -29,8 +29,6 @@ MessagesList DCD Message_FilerOpenDir ...@@ -29,8 +29,6 @@ MessagesList DCD Message_FilerOpenDir
DCD Message_FilerCloseDir DCD Message_FilerCloseDir
DCD Message_FilerOpenDirAt DCD Message_FilerOpenDirAt
DCD Message_DataSave DCD Message_DataSave
DCD Message_DataSaveAck
DCD Message_RAMFetch
DCD Message_DataLoad DCD Message_DataLoad
DCD Message_DataLoadAck DCD Message_DataLoadAck
DCD Message_ModeChange DCD Message_ModeChange
......
...@@ -65,13 +65,6 @@ messages_processed_start ...@@ -65,13 +65,6 @@ messages_processed_start
B message_fileropendirat_code B message_fileropendirat_code
DCD Message_DataSave DCD Message_DataSave
B message_datasave_code B message_datasave_code
[ version >= 117
|
DCD Message_DataSaveAck
B message_datasaveack_code
DCD Message_RAMFetch
B message_ramfetch_code
]
DCD Message_DataLoad DCD Message_DataLoad
B message_dataload_code B message_dataload_code
DCD Message_DataLoadAck DCD Message_DataLoadAck
......
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