Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

determine the current screen using the search object view #1667

Merged
merged 1 commit into from Nov 5, 2013
Merged

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Nov 4, 2013

It was getting the screen for the result window, but that doesn’t get moved over until later in this method, so it always referred to the main display. As a result, NSIntersectionRect() on line 489 always returned an origin and size of (0.0, 0.0) since there was no overlap.

(FYI, I originally found that commenting out line 489 fixed it too. I wonder if we even need it.)

The result controller doesn't get moved over until later in this method.

fixes #1304
@pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Nov 5, 2013

Seems like you've got it.
I think line 489 is useful - if say the result window is half on the screen, half off the screen, then that line will resize it so its fully on the screen.
(Say it's really wide which works on your big 21" screen, then you open QS on your MBA 11" screen and it's cut off the side, this'll resize it to fit the screen)

pjrobertson added a commit that referenced this issue Nov 5, 2013
determine the current screen using the search object view
@pjrobertson pjrobertson merged commit 3d52e57 into master Nov 5, 2013
@pjrobertson pjrobertson deleted the i1304 branch Nov 5, 2013
@skurfer
Copy link
Member Author

@skurfer skurfer commented Nov 5, 2013

Cool. Now, the question I fear to ask: Should I cherry-pick this and do another 1.1.x release? Doesn’t look like we’re very close to a release based on master. 😕

@pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Nov 5, 2013

Cool. Now, the question I fear to ask: Should I cherry-pick this and do another 1.1.x release? Doesn’t look like we’re very close to a release based on master.

I was afraid we might have to do that.
The whole objectDictionary thing is taking a while (my fault), and I’m back in China now so things are going to be even more difficult. I say go ahead.
…shall we drop 10.7 as well? ;-)

On 5 Nov 2013, at 12:32, Rob McBroom notifications@github.com wrote:

Cool. Now, the question I fear to ask: Should I cherry-pick this and do another 1.1.x release? Doesn’t look like we’re very close to a release based on master.


Reply to this email directly or view it on GitHub.

@skurfer
Copy link
Member Author

@skurfer skurfer commented Nov 5, 2013

OK, I will. I did the build in the good ol’ 10.8 VM, though now that you’ve merged that other thing, we could probably merge it into v1.1.x as well so I don’t have to do that any more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants