Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
35ccb9b1
Commit
35ccb9b1
authored
Jul 15, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: CAS: show drag-copy-cursor when receiving items from the playlist (10.6+ only)
parent
a3c2e9d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
modules/gui/macosx/CompatibilityFixes.h
modules/gui/macosx/CompatibilityFixes.h
+5
-0
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+5
-0
No files found.
modules/gui/macosx/CompatibilityFixes.h
View file @
35ccb9b1
...
@@ -79,6 +79,11 @@ extern OSErr UpdateSystemActivity(UInt8 activity);
...
@@ -79,6 +79,11 @@ extern OSErr UpdateSystemActivity(UInt8 activity);
@interface
NSURL
(
IntroducedInSnowLeopard
)
@interface
NSURL
(
IntroducedInSnowLeopard
)
-
(
NSArray
*
)
pathComponents
;
-
(
NSArray
*
)
pathComponents
;
@end
@end
@interface
NSCursor
(
IntroducedInSnowLeopard
)
+
(
NSCursor
*
)
dragCopyCursor
;
@end
#endif
#endif
#pragma mark -
#pragma mark -
...
...
modules/gui/macosx/ConvertAndSave.m
View file @
35ccb9b1
...
@@ -605,6 +605,9 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -605,6 +605,9 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
b_activeDragAndDrop
=
YES
;
b_activeDragAndDrop
=
YES
;
[
self
setNeedsDisplay
:
YES
];
[
self
setNeedsDisplay
:
YES
];
if
(
OSX_SNOW_LEOPARD
||
OSX_LION
)
[[
NSCursor
dragCopyCursor
]
set
];
if
((
NSDragOperationGeneric
&
[
sender
draggingSourceOperationMask
])
==
NSDragOperationGeneric
)
if
((
NSDragOperationGeneric
&
[
sender
draggingSourceOperationMask
])
==
NSDragOperationGeneric
)
return
NSDragOperationGeneric
;
return
NSDragOperationGeneric
;
...
@@ -613,12 +616,14 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -613,12 +616,14 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
-
(
void
)
draggingEnded
:(
id
<
NSDraggingInfo
>
)
sender
-
(
void
)
draggingEnded
:(
id
<
NSDraggingInfo
>
)
sender
{
{
[[
NSCursor
arrowCursor
]
set
];
b_activeDragAndDrop
=
NO
;
b_activeDragAndDrop
=
NO
;
[
self
setNeedsDisplay
:
YES
];
[
self
setNeedsDisplay
:
YES
];
}
}
-
(
void
)
draggingExited
:(
id
<
NSDraggingInfo
>
)
sender
-
(
void
)
draggingExited
:(
id
<
NSDraggingInfo
>
)
sender
{
{
[[
NSCursor
arrowCursor
]
set
];
b_activeDragAndDrop
=
NO
;
b_activeDragAndDrop
=
NO
;
[
self
setNeedsDisplay
:
YES
];
[
self
setNeedsDisplay
:
YES
];
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment