Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2013-05-25 18:08:56 +0400
committerTon Roosendaal <ton@blender.org>2013-05-25 18:08:56 +0400
commit24321d4891224befb9e9ee666950f02b21e6f1c7 (patch)
tree7859c456b71cc4a67ab5855c6a1dac6c3ce1fa63 /intern
parent9bf7a2a8c49d07bf41b5b2f743075ccf45cc9e02 (diff)
Solving ancient Blender window sizing issue;
- Removed grid-snapping for area coordinates on scaling windows. That caused the areas to shrink or expand, and eventually corrupt screen layouts. - Added simple but efficient life resize for OSX. I need to know why this is so much code for Windows... I suggest Windows to just copy same method; dispatch the queue, and just let the event system draw.
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_WindowCocoa.mm20
-rw-r--r--intern/ghost/intern/GHOST_WindowWin32.cpp2
2 files changed, 4 insertions, 18 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index b8d52a2b4ff..472136b8130 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -53,17 +53,7 @@ enum {
#endif
#pragma mark Cocoa window delegate object
-/* live resize ugly patch
-extern "C" {
- struct bContext;
- typedef struct bContext bContext;
- bContext* ghostC;
- extern int wm_window_timer(const bContext *C);
- extern void wm_window_process_events(const bContext *C);
- extern void wm_event_do_handlers(bContext *C);
- extern void wm_event_do_notifiers(bContext *C);
- extern void wm_draw_update(bContext *C);
-};*/
+
@interface CocoaWindowDelegate : NSObject
<NSWindowDelegate>
{
@@ -125,14 +115,10 @@ extern "C" {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
//}
#endif
- /* Live resize ugly patch. Needed because live resize runs in a modal loop, not letting main loop run
+ /* Live resize, send event, gets handled in wm_window.c. Needed because live resize runs in a modal loop, not letting main loop run */
if ([[notification object] inLiveResize]) {
systemCocoa->dispatchEvents();
- wm_window_timer(ghostC);
- wm_event_do_handlers(ghostC);
- wm_event_do_notifiers(ghostC);
- wm_draw_update(ghostC);
- }*/
+ }
}
- (void)windowDidChangeBackingProperties:(NSNotification *)notification
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 2d3997cdc14..78a69eb6c4f 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -887,7 +887,7 @@ GHOST_TSuccess GHOST_WindowWin32::installDrawingContext(GHOST_TDrawingContextTyp
}
else {
m_multisampleEnabled = GHOST_kSuccess;
- printf("Multisample failed to initialized\n");
+ printf("Multisample failed to initialize\n");
success = GHOST_kSuccess;
}
}