Skip to content

Commit af4976a

Browse files
author
runrevali
committed
Merge remote-tracking branch 'upstream/develop' into refactor-syntax_6_7_rc_1_merge
2 parents cbe6cf7 + c0fd019 commit af4976a

File tree

9 files changed

+43
-9
lines changed

9 files changed

+43
-9
lines changed

‎docs/dictionary/command/revBrowserSet.xml‎

100644100755
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<examples>
2020
<example>revBrowserSet tBrowserId, "url", "http://www.runrev.com"</example>
21-
<example><p>answer file "Please choose a file to display"</p><p>if the
22-
result is not "cancel" then</p><p> put it into tFile</p><p> put
23-
revBrowserSet tBrowserID,"url","file://" &amp; tFile </p><p>end
21+
<example><p>answer file "Please choose a file to display"</p><p>if theresult
22+
is not "cancel" then</p><p> put it into tFile</p><p> put revBrowserSet
23+
tBrowserID,"url","file://" &amp; tFile </p><p>end
2424
if</p></example>
2525
</examples>
2626

@@ -183,7 +183,10 @@ stack</description>
183183

184184
<value>The <b>revBrowserSet</b> command puts empty into the result if
185185
successful. </value>
186-
<comments><note> The "advanced" callback messages are: <message tag="browserClick">browserClick</message>, <message tag="browserOut">browserOut</message> and <message tag="browserOver">browserOver</message>. These messages are only sent when
186+
<comments><note> The "advanced" callback messages are: <message
187+
tag="browserClick">browserClick</message>, <message
188+
tag="browserOut">browserOut</message> and <message
189+
tag="browserOver">browserOver</message>. These messages are only sent when
187190
the "messages" property is set to true. The other callback messages are
188191
always sent.<p></note><p></p><note> Setting the selected property selects
189192
the first instance of that text. Setting the property repeatedly to the same
@@ -223,7 +226,8 @@ false</p><p>end browserDisableScrollbars</p><p></p><p>on
223226
browserToggleScrollbars</p><p> revBrowserSet sBrowserId, scrollbars,
224227
(not(revBrowserGet(sBrowserId, scrollbars)))</p><p>end
225228
browserToggleScrollbars</p><p></p><p></p><p></p><note> For general
226-
information on using the browser library, see the notes in the <function tag="revBrowserOpen">revBrowserOpen function</function>
229+
information on using the browser library, see the notes in the <function
230+
tag="revBrowserOpen">revBrowserOpen function</function>
227231
reference.</note><p>&#9;</p></comments>
228232
</description>
229233
</doc>

‎docs/dictionary/function/revBrowserOpenCef.xml‎

100644100755
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,11 @@ into tFile</p><p> put revBrowserOpenCef(the windowId of this stack,
6060
command</command>
6161
<command tag="revBrowserSet">revBrowserSet command</command>
6262
<command tag="revBrowserClose">revBrowserClose command</command>
63-
<command tag="revBrowserAddJavaScriptHandler">revBrowserAddJavaScriptHandler
63+
<command
64+
tag="revBrowserAddJavaScriptHandler">revBrowserAddJavaScriptHandler
6465
command</command>
65-
<command tag="revBrowserRemoveJavaScriptHandler">revBrowserRemoveJavaScriptHandler
66+
<command
67+
tag="revBrowserRemoveJavaScriptHandler">revBrowserRemoveJavaScriptHandler
6668
command</command>
6769
<message tag="browserOver">browserOver message</message>
6870
<message tag="browserNewInstance">browserNewInstance message</message>

‎docs/notes/bugfix-13201.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# textFont in Text Formatting of inspector cannot scroll by a mouse

‎docs/notes/bugfix-13284.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Mouse is still inside the window even when resizing, causing incorrect actions.

‎engine/kernel-standalone.vcproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@
128128
/>
129129
<Tool
130130
Name="VCPostBuildEventTool"
131+
Description="Copy standalone manifest template files to build folder"
132+
CommandLine="copy &quot;$(InputDir)rsrc\w32-manifest-template*.xml&quot; &quot;$(OutDir)"
131133
/>
132134
</Configuration>
133135
</Configurations>

‎engine/src/button.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,8 +1149,10 @@ Boolean MCButton::mdown(uint2 which)
11491149
state |= CS_MFOCUSED;
11501150
if (state & CS_SUBMENU && (menubutton == 0 || (uint1)which == menubutton))
11511151
{
1152-
if (state & CS_SCROLLBAR && mx > rect.x + rect.width - MCscrollbarwidth
1153-
&& mx < rect.x + rect.width)
1152+
// SN-2014-08-26: [[ Bug 13201 ]] mx/my are now related to the button's rectangle,
1153+
// not the stack's rectangle anymore.
1154+
if (state & CS_SCROLLBAR && mx > rect.width - MCscrollbarwidth
1155+
&& mx < rect.width)
11541156
{
11551157
menu->mdown(which);
11561158
state |= CS_FIELD_GRAB;

‎engine/src/mac-core.mm‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,6 +1636,19 @@ void MCMacPlatformHandleMouseAfterWindowHidden(void)
16361636
MCMacPlatformHandleMouseMove(s_mouse_screen_position);
16371637
}
16381638

1639+
// MW-2014-06-27: [[ Bug 13284 ]] When live resizing starts, leave the window, and enter it again when it finishes.
1640+
void MCMacPlatformHandleMouseForResizeStart(void)
1641+
{
1642+
if (s_mouse_window != nil)
1643+
MCPlatformCallbackSendMouseLeave(s_mouse_window);
1644+
}
1645+
1646+
void MCMacPlatformHandleMouseForResizeEnd(void)
1647+
{
1648+
if (s_mouse_window != nil)
1649+
MCPlatformCallbackSendMouseEnter(s_mouse_window);
1650+
}
1651+
16391652
void MCMacPlatformHandleMouseMove(MCPoint p_screen_loc)
16401653
{
16411654
// First compute the window that should be active now.

‎engine/src/mac-internal.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@ void MCMacPlatformHandleMouseScroll(CGFloat dx, CGFloat dy);
506506
void MCMacPlatformHandleMouseSync(void);
507507
void MCMacPlatformHandleMouseAfterWindowHidden(void);
508508

509+
void MCMacPlatformHandleMouseForResizeStart(void);
510+
void MCMacPlatformHandleMouseForResizeEnd(void);
511+
509512
void MCMacPlatformSyncMouseBeforeDragging(void);
510513
void MCMacPlatformSyncMouseAfterTracking(void);
511514

‎engine/src/mac-window.mm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,10 +397,16 @@ - (void)windowWillStartLiveResize:(NSNotification *)notification
397397
// MW-2014-04-23: [[ Bug 12270 ]] The user has started sizing the window
398398
// so set us as reshape by user.
399399
m_user_reshape = true;
400+
401+
// MW-2014-06-27: [[ Bug 13284 ]] Make sure the mouse temporarily leaves the window.
402+
MCMacPlatformHandleMouseForResizeStart();
400403
}
401404

402405
- (void)windowDidEndLiveResize:(NSNotification *)notification
403406
{
407+
// MW-2014-06-27: [[ Bug 13284 ]] Make sure the mouse returns to the window.
408+
MCMacPlatformHandleMouseForResizeEnd();
409+
404410
// MW-2014-04-23: [[ Bug 12270 ]] The user has stopped sizing the window
405411
// so unset us as reshape by user.
406412
m_user_reshape = false;

0 commit comments

Comments
 (0)