Skip to content

Commit 095f1c3

Browse files
livecodesebastienlivecodesebastien
committed
Merge remote-tracking branch 'origin/develop-6.7' into merge-develop-6.7_101115
Clean merge, apart from the files listed in 'Conflicts'. Conflicts: buildbot.mk
2 parents c8c5be7 + 0fd9238 commit 095f1c3

10 files changed

Lines changed: 63 additions & 24 deletions

File tree

‎HACKING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Once your changes have been reviewed and tested, they will be merged in time for
8080

8181
Finding and fixing bugs in LiveCode is a particularly valuable contribution.
8282

83-
If you've found a bug, please add a ticket to the [LiveCode issue tracking system](http://quality.runrev.com/). This will give you a bug number which can be used whenever discussing the issue, and included in git commit log messages and in GitHub pull request descriptions. This will help other contributors keep track of who's working on what.
83+
If you've found a bug, please add a ticket to the [LiveCode issue tracking system](http://quality.livecode.com/). This will give you a bug number which can be used whenever discussing the issue, and included in git commit log messages and in GitHub pull request descriptions. This will help other contributors keep track of who's working on what.
8484

8585
When you submit a pull request that fixes a bug, the status of the bug should be set to "AWAITING_MERGE" -- please also add a comment to the bug with a link to the pull request's page.
8686

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ There are several ways to get help with installing and using LiveCode:
8787

8888
* Visit the [LiveCode open source forums](http://forums.livecode.com/viewforum.php?f=65). In particular, you may wish to post your question in the [Engine Contributors](http://forums.livecode.com/viewforum.php?f=66) forum.
8989

90-
* If you have discovered a bug, have a feature request, or have written a patch to improve LiveCode, please create an ticket in the [LiveCode issue tracking system](http://quality.runrev.com/).
90+
* If you have discovered a bug, have a feature request, or have written a patch to improve LiveCode, please create an ticket in the [LiveCode issue tracking system](http://quality.livecode.com/).
9191

9292
## Contributing to LiveCode
9393

‎buildbot.mk‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,15 @@ docs_build_dir = ${top_src_dir}/_build/docs-build
103103
ifeq ($(BUILD_PLATFORM),mac)
104104
LIVECODE = $(bin_dir)/LiveCode-Community.app/Contents/MacOS/LiveCode-Community
105105
buildtool_platform = mac
106+
UPLOAD_ENABLE_CHECKSUM ?= no
106107
else ifeq ($(BUILD_PLATFORM),linux-x86)
107108
LIVECODE = $(bin_dir)/LiveCode-Community
108109
buildtool_platform = linux
110+
UPLOAD_ENABLE_CHECKSUM ?= yes
109111
else ifeq ($(BUILD_PLATFORM),linux-x86_64)
110112
LIVECODE = $(bin_dir)/LiveCode-Community
111113
buildtool_platform = linux
114+
UPLOAD_ENABLE_CHECKSUM ?= yes
112115
endif
113116

114117
# FIXME add --warn-as-error
@@ -119,6 +122,7 @@ buildtool_command = $(LIVECODE) -ui $(BUILDTOOL_STACK) \
119122

120123
# Settings for upload
121124
RSYNC ?= rsync
125+
SHA1SUM ?= sha1sum
122126
UPLOAD_SERVER ?= meg.on-rev.com
123127
UPLOAD_PATH = staging/$(BUILD_LONG_VERSION)/$(GIT_VERSION)
124128
UPLOAD_MAX_RETRIES = 50
@@ -180,19 +184,23 @@ dist-tools-commercial:
180184
--built-docs-dir $(docs_build_dir)/cooked-commercial
181185

182186
# Make a list of installers to be uploaded to the distribution server
183-
dist-upload-files.txt:
187+
# If a checksum file is needed, generate it with sha1sum
188+
dist-upload-files.txt sha1sum.txt:
189+
set -e; \
184190
find . -maxdepth 1 -name 'LiveCode*Installer-*-Mac.dmg' \
185191
-o -name 'LiveCode*Installer-*-Windows.exe' \
186192
-o -name 'LiveCode*Installer-*-Linux.*' \
187193
-o -name 'LiveCode*Server-*-Linux*.zip' \
188194
-o -name 'LiveCode*Server-*-Mac.zip' \
189195
-o -name 'LiveCode*Server-*-Windows.zip' \
190196
-o -name '*-bin.tar.xz' \
191-
> $@
192-
193-
# Compute the SHA-1 sum of all the installers to be uploaded
194-
sha1sum.txt: dist-upload-files.txt
195-
sha1sum < dist-upload-files.txt > $@
197+
> dist-upload-files.txt; \
198+
if test "$(UPLOAD_ENABLE_CHECKSUM)" = "yes"; then \
199+
$(SHA1SUM) < dist-upload-files.txt > sha1sum.txt; \
200+
echo sha1sum.txt >> dist-upload-files.txt; \
201+
else \
202+
touch sha1sum.txt; \
203+
fi
196204

197205
# Perform the upload. This is in two steps:
198206
# (1) Create the target directory
@@ -202,14 +210,14 @@ sha1sum.txt: dist-upload-files.txt
202210
# connection drops
203211
dist-upload-mkdir:
204212
ssh $(UPLOAD_SERVER) "mkdir -p \"$(UPLOAD_PATH)\""
205-
dist-upload: dist-upload-files.txt sha1sum.txt dist-upload-mkdir
213+
dist-upload: dist-upload-files.txt dist-upload-mkdir
206214
trap "echo Interrupted; exit;" SIGINT SIGTERM; \
207215
i=0; \
208216
false; \
209217
while [ $$? -ne 0 -a $$i -lt $(UPLOAD_MAX_RETRIES) ] ; do \
210218
i=$$(($$i+1)); \
211219
rsync -v --progress --partial --chmod=ugo=rwX --executability \
212-
--files-from=dist-upload-files.txt sha1sum.txt . $(UPLOAD_SERVER):"\"$(UPLOAD_PATH)\""; \
220+
--files-from=dist-upload-files.txt . $(UPLOAD_SERVER):"\"$(UPLOAD_PATH)\""; \
213221
done; \
214222
rc=$$?; \
215223
if [ $$i -eq $(UPLOAD_MAX_RETRIES) ]; then \

‎builder/release_notes_builder.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ function makeBugTable pBugs, pBold
258258
put tNoID & "<td>" & item 2 of tLine & "</td></tr>" into tNoID
259259
end if
260260
else
261-
put "http://quality.runrev.com/show_bug.cgi?id=" & item 1 of tLine into tBugUrl
261+
put "http://quality.livecode.com/show_bug.cgi?id=" & item 1 of tLine into tBugUrl
262262
if pBold then
263263
put tBugs & CR & "<tr><td><strong>" & item 1 of tLine & "</strong></td>" & CR into tBugs
264264
put tBugs & "<td><a href=" & quote & tBugUrl & quote & "><strong>" & item 2 of tLine & "</strong></a></td></tr>" into tBugs

‎docs/notes/bugfix-16368.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Hiding a mobile player does not automatically hide the controller on Android

‎docs/notes/bugfix-16391.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Going to a card forces a stack onscreen

‎engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,17 @@ else if (mFdWithOffset)
308308
return;
309309
}
310310
}
311+
312+
// PM-2015-11-05: [[ Bug 16368 ]] Toggling the visibility of the android player should show/hide the controller (if any)
313+
public void setControllerVisible(boolean p_visible)
314+
{
315+
if (mMediaController != null ){
316+
if (p_visible)
317+
mMediaController.show(0);
318+
else
319+
mMediaController.hide();
320+
}
321+
}
311322

312323
public void setMediaController(MediaController controller) {
313324
if (mMediaController != null) {

‎engine/src/java/com/runrev/android/nativecontrol/VideoControl.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,15 @@ public void setShowController(boolean show)
163163
else
164164
m_video_view.setMediaController(null);
165165
}
166-
166+
167+
// PM-2015-11-05: [[ Bug 16368 ]] Toggling the visibility of the android player should show/hide the controller (if any)
168+
// Override setVisible() of NativeControl
169+
public void setVisible(boolean p_visible)
170+
{
171+
m_video_view.setControllerVisible(p_visible);
172+
super.setVisible(p_visible);
173+
}
174+
167175
public void setCurrentTime(int msec)
168176
{
169177
m_video_view.seekTo(msec);

‎engine/src/stack.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ class MCStack : public MCObject
391391

392392
// IM-2014-01-16: [[ StackScale ]] Ensure the view rect & transform are in sync with the configured view properties
393393
// (stack viewport, fullscreen mode, fullscreen, scale factor)
394-
void view_update_transform(void);
394+
void view_update_transform(bool p_ensure_onscreen = false);
395395

396396
// IM-2014-01-16: [[ StackScale ]] Calculate the new view rect, transform, and adjusted stack rect for the given stack rect
397397
void view_calculate_viewports(const MCRectangle &p_stack_rect, MCRectangle &r_adjusted_stack_rect, MCRectangle &r_view_rect, MCGAffineTransform &r_transform);

‎engine/src/stackview.cpp‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ void MCStack::view_set_content_scale(MCGFloat p_scale)
214214
m_view_content_scale = p_scale;
215215

216216
// IM-2014-01-16: [[ StackScale ]] Update view transform after changing view property
217-
view_update_transform();
217+
view_update_transform(true);
218218
// IM-2014-10-22: [[ Bug 13746 ]] Update window mask when stack scale changes
219219
loadwindowshape();
220220
}
@@ -427,7 +427,7 @@ void MCStack::view_calculate_viewports(const MCRectangle &p_stack_rect, MCRectan
427427
r_transform = MCGAffineTransformConcat(view_get_stack_transform(t_mode, MCGRectangleGetIntegerBounds(t_scaled_rect), t_view_rect), t_transform);
428428
}
429429

430-
void MCStack::view_update_transform(void)
430+
void MCStack::view_update_transform(bool p_ensure_onscreen)
431431
{
432432
MCRectangle t_view_rect;
433433
MCGAffineTransform t_transform;
@@ -452,20 +452,30 @@ void MCStack::view_update_transform(void)
452452
}
453453

454454
// PM-2015-07-17: [[ Bug 13754 ]] Make sure stack does not disappear off screen when changing the scalefactor
455-
MCRectangle t_bounded_rect, t_screen_rect;
456-
457-
const MCDisplay* t_nearest_display = MCscreen -> getnearestdisplay(t_view_rect);
458-
if (t_nearest_display != NULL)
455+
MCRectangle t_bounded_rect;
456+
if (p_ensure_onscreen)
459457
{
460-
t_screen_rect = t_nearest_display -> viewport;
461-
t_bounded_rect = MCU_bound_rect(t_view_rect, t_screen_rect . x, t_screen_rect . y, t_screen_rect . width, t_screen_rect . height);
458+
// AL-2015-10-01: [[ Bug 16017 ]] Remember location of stacks on a second monitor
459+
const MCDisplay* t_nearest_display;
460+
t_nearest_display = MCscreen -> getnearestdisplay(t_view_rect);
461+
462+
if (t_nearest_display != nil)
463+
{
464+
MCRectangle t_screen_rect;
465+
t_screen_rect = t_nearest_display -> viewport;
466+
t_bounded_rect = MCU_bound_rect(t_view_rect, t_screen_rect . x, t_screen_rect . y, t_screen_rect . width, t_screen_rect . height);
467+
}
468+
else
469+
{
470+
// In noUI mode, we don't have a nearest display.
471+
t_bounded_rect = MCU_bound_rect(t_view_rect, 0, 0, MCscreen -> getwidth(), MCscreen -> getheight());
472+
}
462473
}
463474
else
464475
{
465-
// In noUI mode, we don't have a nearest display.
466-
t_bounded_rect = MCU_bound_rect(t_view_rect, 0, 0, MCscreen -> getwidth(), MCscreen -> getheight());
476+
t_bounded_rect = t_view_rect;
467477
}
468-
478+
469479
// IM-2014-01-16: [[ StackScale ]] Update view rect if needed
470480
view_setrect(t_bounded_rect);
471481
}

0 commit comments

Comments
 (0)