[CEF 2623] Upgrade to latest CEF #544
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -334,8 +334,15 @@ - (void)windowWillEnterFullScreen:(NSNotification *)notification { | |
| } | ||
| if (customTitlebar) { | ||
| [customTitlebar setHidden:YES]; | ||
| NSWindow *window = [notification object]; | ||
|
|
||
| // Since we have nuked the title, we will have | ||
| // to set the string back as we are hiding the | ||
| // custom title bar. | ||
| [window setTitle:[customTitlebar titleString]]; | ||
|
There was a problem hiding this comment. @nethip I did run into a console message viz., the following. Was that happening earlier also?
There was a problem hiding this comment. This was happening earlier with 10.11 sdk. Please refer to my comment https://github.com/adobe/brackets-shell/pull/544/files/d3cd41c8fb964cd5634b3babdeec9dd25e681861#r63060349 for more explanation on this, There was a problem hiding this comment. @nethip There was a problem hiding this comment. Which SDK are you on? I have built this using 10.11 sdk and it seems to work fine. There was a problem hiding this comment. Oh I see that you are using OS dark theme. Let me give that a try. There was a problem hiding this comment. @nethip
Shouldn't that be updated? Changing that causes appshell build to fail. The errors and deprecations should be fixed.
There was a problem hiding this comment. This is weird. can you bring your laptop to the office tomorrow? There was a problem hiding this comment. About the deprecation and 10.6 target, I think that is something we can work on post 1.7. Agree with you updating the target as well as the removing the npm deprecation warnings. |
||
| } | ||
|
|
||
|
|
||
| if ([self needsFullScreenActivateHack]) { | ||
| [NSApp activateIgnoringOtherApps:YES]; | ||
| [NSApp unhide:nil]; | ||
|
|
@@ -424,6 +431,11 @@ -(void)windowWillExitFullScreen:(NSNotification *)notification { | |
| // transition from fullscreen back to normal | ||
| if (customTitlebar) { | ||
| [customTitlebar setHidden:NO]; | ||
|
|
||
| // Nuke the OS title as the title string is going to | ||
| // drawn by customTitleBar. | ||
| NSWindow *window = [notification object]; | ||
| [window setTitle:@""]; | ||
| } | ||
| if (trafficLightsView) { | ||
| [trafficLightsView setHidden:NO]; | ||
|
|
@@ -601,7 +613,7 @@ - (void)createApp:(id)object { | |
| NSClosableWindowMask | | ||
| NSMiniaturizableWindowMask | | ||
| NSResizableWindowMask | | ||
| NSUnifiedTitleAndToolbarWindowMask ); | ||
|
|
||
| // Get the available screen space | ||
| NSRect screen_rect = [[NSScreen mainScreen] visibleFrame]; | ||
|
|
@@ -650,7 +662,6 @@ - (void)createApp:(id)object { | |
| content_rect = [mainWnd contentRectForFrameRect:[mainWnd frame]]; | ||
|
|
||
| // Configure the rest of the window | ||
| [mainWnd setDelegate:self.delegate]; | ||
| [mainWnd setCollectionBehavior: (1 << 7) /* NSWindowCollectionBehaviorFullScreenPrimary */]; | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,9 +56,12 @@ | |
| NSWindow* window = [view window]; | ||
| std::string titleStr(title); | ||
| NSString* str = [NSString stringWithUTF8String:titleStr.c_str()]; | ||
|
|
||
|
There was a problem hiding this comment. @nethip There was a problem hiding this comment. message in XCode console - There was a problem hiding this comment. Are you able to repro this scenario? I will check with you tomorrow in the office. There was a problem hiding this comment. Wasn't able to reproduce the error message :( But reproducing the title disappearance is very straight forward. There was a problem hiding this comment. I think you missed telling me you were in full screen mode 😄 But that is fine as I figured that out from the video that you had posted. |
||
| NSObject* delegate = [window delegate]; | ||
| if ([window styleMask] & NSFullScreenWindowMask) { | ||
| [window setTitle:str]; | ||
| } | ||
|
|
||
| [delegate performSelectorOnMainThread:@selector(windowTitleDidChange:) withObject:str waitUntilDone:NO]; | ||
| } | ||
|
|
||
|
|
@@ -323,6 +326,13 @@ -(void)windowWillExitFullScreen:(NSNotification *)notification { | |
| // transforms from full screen back to normal | ||
| if (customTitlebar) { | ||
| [customTitlebar setHidden:NO]; | ||
|
|
||
| NSWindow *popUpWindow = [notification object]; | ||
|
|
||
| // Since we have nuked the title, we will have | ||
| // to set the string back as we are hiding the | ||
| // custom title bar. | ||
| [popUpWindow setTitle:@""]; | ||
| } | ||
| if (trafficLightsView) { | ||
| [trafficLightsView setHidden:NO]; | ||
|
|
@@ -352,6 +362,13 @@ - (void)windowWillEnterFullScreen:(NSNotification *)notification { | |
| } | ||
| if (customTitlebar) { | ||
| [customTitlebar setHidden:YES]; | ||
|
|
||
| NSWindow *popUpWindow = [notification object]; | ||
|
|
||
| // Since we have nuked the title, we will have | ||
| // to set the string back as we are hiding the | ||
| // custom title bar. | ||
| [popUpWindow setTitle:[customTitlebar titleString]]; | ||
| } | ||
| if ([self needsFullScreenActivateHack]) { | ||
| // HACK to make sure that window is activate | ||
|
|
@@ -520,7 +537,7 @@ - (void)windowDidResignKey:(NSNotification *)notification { | |
|
|
||
|
|
||
| // CEF 1750 -- We need to not handle keys for the DevTools Window. | ||
| if (browser->GetFocusedFrame()->GetURL() == "chrome-devtools://devtools/inspector.html") { | ||
| return false; | ||
| } | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nethip cefbuilds.com has a link to 3.2623.1399. why is this difference? this has a mention to 3.2623.1397.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think cefbuilds.com is still churning out builds out of 2623 branch and the branch would have moved by some commits by now. The build date is showing 2016-05-11 so this must have got built yesterday. That reminds me if I have to update 2623 to the latest commit. Let me go check CEF branch to see if anything important has been merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have verified all the recent commits. Here is the list
b90a3be (Call RenderProcessHost::Send from correct thread (issue #1881))
5b27df3
64e2fe1
93f8103
Out of these, b90a3be seems to be whole lot changes relating to using render process id for identification. I kind of backtracked and looks like these are OSR related bugs. So I am not sure if we want to refresh the binaries.