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

Merge 3.11 into develop #5223

Merged
merged 39 commits into from Oct 28, 2020
Merged

Merge 3.11 into develop #5223

merged 39 commits into from Oct 28, 2020

Conversation

mossheim
Copy link
Contributor

Purpose and Motivation

regular git-flow merge of 3.11 into develop

To-do list

  • Code is tested
  • All tests are passing
  • Updated documentation
  • This PR is ready for review

miriamvoth and others added 30 commits October 24, 2020 15:36
Connected to Issue #4573: it should be explicitly stated if a
function checks for equality or identity. A lot of the examples
used the shortcut for initializing an event, which leads to
a different behaviour regarding checks for equality. So I decided
to also change all the examples to use a correct initilization for
creating a dictionary object.
Pattern.record used to simply ignore header and sample format provided
as arguments
elgiano and others added 9 commits October 24, 2020 23:48
- this also contains a change to how the result of a javascript call is returned to SC w/r/t QVariant and meta-type system, see https://github.com/supercollider/supercollider/pull/4883/files#r509325677 for more discussion
- fixed code execution in both HelpBrowser class and Widget + in WebView, if the rendered webpage has selectLine()/selectRegion() javascript functions. It works with selected text/line, and with selected text/region.
- code execution in webviews is more consistently delegated to javascript, calling a function to get selected text, receiving it in a callback and then sending it to the interpreter
- a workaround WebView's "funny" keypress behavior, now keyDownAction works on WebView only when an url is set. It gets all events (including the ones swallowed by the renderer) without duplication. WebView parent widgets also get all keystrokes, except the ones swallowed by the web renderer when focusing an input field (like Shift+Enter).
- Using QcWebView in ScIDE Help Browser Widget
"radians" not "radiants"
[3.11] cherry-pick documentation PRs for 3.11.2
…ctional

[3.11] Cherry-pick several functional PRs for 3.11.2
@mossheim
Copy link
Contributor Author

i'm not sure why the diff looks so big here. i merged it locally to test and the diff is only from #4883 and #5219, +160/-114. i guess github is not recognizing that these commits are also on develop

@dyfer
Copy link
Member

dyfer commented Oct 28, 2020

I don't understand the diff here either.
I tried to merge 3.11 into develop locally, uploaded to a new branch, and that one does show +160/-114 diff: #5228

@mossheim
Copy link
Contributor Author

@dyfer ok! mind approving this then?

Copy link
Member

@dyfer dyfer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's see what happens! ;)
Thanks!

@mossheim mossheim merged commit 157218e into develop Oct 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants