Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d55d2ec8
Commit
d55d2ec8
authored
Sep 18, 2013
by
Ken Thomases
Committed by
Alexandre Julliard
Sep 18, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Move memory management of liveResizeDisplayTimer into property setter.
parent
a3197b8a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
6 deletions
+15
-6
cocoa_window.m
dlls/winemac.drv/cocoa_window.m
+15
-6
No files found.
dlls/winemac.drv/cocoa_window.m
View file @
d55d2ec8
...
...
@@ -158,6 +158,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
@property
(
assign
,
nonatomic
)
void
*
imeData
;
@property
(
nonatomic
)
BOOL
commandDone
;
@property
(
retain
,
nonatomic
)
NSTimer
*
liveResizeDisplayTimer
;
-
(
void
)
updateColorSpace
;
-
(
BOOL
)
becameEligibleParentOrChild
;
...
...
@@ -468,6 +470,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
@synthesize
colorKeyed
,
colorKeyRed
,
colorKeyGreen
,
colorKeyBlue
;
@synthesize
usePerPixelAlpha
;
@synthesize
imeData
,
commandDone
;
@synthesize
liveResizeDisplayTimer
;
+
(
WineWindow
*
)
createWindowWithFeatures
:(
const
struct
macdrv_window_features
*
)
wf
windowFrame
:(
NSRect
)
window_frame
...
...
@@ -1183,6 +1186,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
[
self
checkTransparency
];
}
-
(
void
)
setLiveResizeDisplayTimer
:
(
NSTimer
*
)
newTimer
{
if
(
newTimer
!=
liveResizeDisplayTimer
)
{
[
liveResizeDisplayTimer
invalidate
];
[
liveResizeDisplayTimer
release
];
liveResizeDisplayTimer
=
[
newTimer
retain
];
}
}
-
(
void
)
makeFocused
:
(
BOOL
)
activate
{
[
self
orderBelow
:
nil
orAbove
:
nil
activate
:
activate
];
...
...
@@ -1463,9 +1476,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
-
(
void
)
windowDidEndLiveResize
:
(
NSNotification
*
)
notification
{
[
liveResizeDisplayTimer
invalidate
];
[
liveResizeDisplayTimer
release
];
liveResizeDisplayTimer
=
nil
;
self
.
liveResizeDisplayTimer
=
nil
;
}
-
(
void
)
windowDidMiniaturize
:
(
NSNotification
*
)
notification
...
...
@@ -1587,13 +1598,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
//
// We address this by "manually" asking our windows to check if they need
// redrawing every so often (during live resize only).
[
self
windowDidEndLiveResize
:
nil
];
liveResizeDisplayTimer
=
[
NSTimer
scheduledTimerWithTimeInterval
:
1
.
0
/
30
.
0
self
.
liveResizeDisplayTimer
=
[
NSTimer
scheduledTimerWithTimeInterval
:
1
.
0
/
30
.
0
target
:
self
selector
:
@selector
(
displayIfNeeded
)
userInfo
:
nil
repeats
:
YES
];
[
liveResizeDisplayTimer
retain
];
[[
NSRunLoop
currentRunLoop
]
addTimer
:
liveResizeDisplayTimer
forMode
:
NSRunLoopCommonModes
];
}
...
...
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