Skip to content

Commit 580b024

Browse files
livecodefraserlivecodefraser
committed
Merge branch 'develop-6.7' of https://github.com/runrev/livecode into business
2 parents b097168 + bb0a36a commit 580b024

11 files changed

Lines changed: 48 additions & 8 deletions

File tree

‎docs/dictionary/command/flip.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<synonyms>
1111
</synonyms>
1212

13-
<summary><change></change>selected</a> part of an <keyword tag="image">image</keyword>.</summary>
13+
<summary><change></change>selected part of an <keyword tag="image">image</keyword>.</summary>
1414

1515
<examples>
1616
<example>flip vertical</example>
@@ -57,5 +57,5 @@
5757
<command tag="choose">choose Command</command>
5858
</references>
5959

60-
<description>Use the <b>flip</b> <glossary tag="command">command</glossary> to turn an <keyword tag="image">image</keyword> over.<p></p><p><b>Parameters:</b></p><p>The <i>image</i> is any image reference.</p><p></p><p><b>Comments:</b></p><p>Theform flips the image vertically, swapping its top and bottom. Theform flips the image side to side, swapping its right and left.</p><p></p><p>If you don't specify an <i>image</i>, the portion currently selected with the Select <glossary tag="paint tool">paint tool</glossary> is flipped.</p><p></p><p>The flipping operation is its own inverse: flipping an image twice in the same direction restores it to its original appearance.</p><p></p><p></p><p></p><important>Flipping a <glossary tag="referenced control">referenced image</glossary> changes its orientation only temporarily. The next time the <glossary tag="referenced control">referenced image</glossary> is displayed, its original orientation returns.</important></description>
60+
<description>Use the <b>flip</b> <glossary tag="command">command</glossary> to turn an <keyword tag="image">image</keyword> over.<p></p><p><b>Parameters:</b></p><p>The <i>image</i> is any image reference.</p><p></p><p><b>Comments:</b></p><p>The form <b>vertical</b> (or <b>up</b> or <b>down</b>) flips the image vertically, swapping its top and bottom. The form <b>horizontal</b> (or <b>right</b> or <b>left</b>) flips the image side to side, swapping its right and left.</p><p></p><p>If you don't specify an <i>image</i>, the portion currently selected with the Select <glossary tag="paint tool">paint tool</glossary> is flipped.</p><p></p><p>The flipping operation is its own inverse: flipping an image twice in the same direction restores it to its original appearance.</p><p></p><p></p><p></p><important>Flipping a <glossary tag="referenced control">referenced image</glossary> changes its orientation only temporarily. The next time the <glossary tag="referenced control">referenced image</glossary> is displayed, its original orientation returns.</important></description>
6161
</doc>

‎docs/dictionary/command/iphoneSetKeyboardReturnKey.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<summary>Configures the type of return key displayed on the keyboard.</summary>
1414

1515
<examples>
16-
<example>iphoneSetKeyboardReturnKey &quot;alphabet&quot;</example>
17-
<example>iphoneSetKeyboardReturnKey &quot;numeric&quot;</example>
16+
<example>iphoneSetKeyboardReturnKey &quot;next&quot;</example>
17+
<example>iphoneSetKeyboardReturnKey &quot;default&quot;</example>
1818
</examples>
1919

2020
<history>

‎docs/notes/bugfix-13575.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Dictionary - iphoneSetKeyboardReturnKey examples

‎docs/notes/bugfix-13923.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# formattedHeight of a button is incorrect if button has an icon

‎docs/notes/bugfix-15096.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Escape key does not dismiss the 'answer color' dialog

‎docs/notes/bugfix-15692.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [Docs] Dictionary entry for "flip" command is missing text

‎docs/notes/bugfix-7217.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# selectionChanged not sent on arrow navigation

‎engine/src/button.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,8 +1918,8 @@ Exec_stat MCButton::getprop_legacy(uint4 parid, Properties which, MCExecPoint& e
19181918
if (icons->curicon != NULL)
19191919
{
19201920
MCRectangle trect = icons->curicon->getrect();
1921-
if (trect.height > fheight)
1922-
fheight = trect.height;
1921+
// PM-2015-07-15: [[ Bug 13923 ]] If a button has an icon, increase its formattedHeight by the icon's height
1922+
fheight += trect.height;
19231923
}
19241924
}
19251925
else if ((getstyleint(flags) == F_CHECK || getstyleint(flags) == F_RADIO) && CHECK_SIZE > fheight)

‎engine/src/fieldf.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,13 +2297,17 @@ void MCField::fmove(Field_translations function, MCStringRef p_string, KeySym ke
22972297
drect.x += getcontentx();
22982298
setfocus(drect.x, drect.y);
22992299
replacecursor(True, function != FT_UP && function != FT_DOWN);
2300+
2301+
// PM-2015-07-20: [[ Bug 7217 ]] Send selectionChanged on arrow navigation, regardless of whether Shift key is held down
23002302
if (state & CS_SELECTING)
23012303
{
23022304
state &= ~CS_SELECTING;
23032305
MCundos->freestate();
2304-
signallisteners(P_HILITED_LINES);
2305-
message(MCM_selection_changed);
23062306
}
2307+
2308+
signallisteners(P_HILITED_LINES);
2309+
message(MCM_selection_changed);
2310+
23072311
extend = extendwords = extendlines = False;
23082312
contiguous = True;
23092313
}

‎engine/src/mac-dialog.mm‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,26 @@ -(void) getColor
849849

850850
//////////
851851
// NSWindow delegate's method
852+
853+
// PM-2015-07-10: [[ Bug 15096 ]] Escape key should dismiss the 'answer color' dialog
854+
- (void) windowDidBecomeKey:(NSNotification *)notification
855+
{
856+
NSEvent* (^handler)(NSEvent*) = ^(NSEvent *theEvent) {
857+
858+
NSEvent *result = theEvent;
859+
// Check if the esc key is pressed
860+
if (theEvent.keyCode == 53)
861+
{
862+
[self processEscKeyDown];
863+
result = nil;
864+
}
865+
866+
return result;
867+
};
868+
869+
eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSKeyDownMask handler:handler];
870+
}
871+
852872
- (void)windowDidResize:(NSNotification *)notification
853873
{
854874
[self relayout];
@@ -858,6 +878,9 @@ -(void) windowWillClose:(NSNotification *)notification
858878
{
859879
if (mResult != kMCPlatformDialogResultSuccess)
860880
mResult = kMCPlatformDialogResultCancel;
881+
882+
// Detach the event monitor when window closes.
883+
[NSEvent removeMonitor:eventMonitor];
861884
}
862885

863886
//////////
@@ -874,6 +897,11 @@ -(void) pickerOkClicked
874897
[self getColor];
875898
}
876899

900+
- (void) processEscKeyDown
901+
{
902+
[self pickerCancelClicked];
903+
}
904+
877905
//////////
878906

879907
-(MCPlatformDialogResult) result

0 commit comments

Comments
 (0)