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

Some help screen issues #2540

Open
wants to merge 86 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
0993c6d
Implement basic HelpDialogMorph
djsrv May 28, 2019
6ddb0d4
Add ScrollFrame to HelpDialogMorph
djsrv May 28, 2019
c361112
Implement basic help screen deserialization
djsrv May 28, 2019
0f28eff
Implement paragraph
djsrv May 28, 2019
af9618c
Use BlockEditorMorph fixLayout in HelpDialogMorph
djsrv May 28, 2019
70a0caa
Fetch XML from help folder
djsrv May 28, 2019
dd7245a
Implement column/row layout
djsrv May 28, 2019
dc4193f
Display scripts in help screens
djsrv May 28, 2019
d5e9636
Improve help screen element positioning
djsrv May 28, 2019
7c08e5b
Allow inline blocks in help screen paragraphs
djsrv May 29, 2019
b4a754b
Adjust help screen elements to fill width
djsrv May 29, 2019
95c85b1
Fix bugs with help screen element widths
djsrv May 29, 2019
8a7799f
Implement basic script diagrams
djsrv May 30, 2019
3a7e2d8
Minor syntax tweaks
djsrv May 30, 2019
7b85e01
Remove unnecessary console.log
djsrv May 30, 2019
9c89e51
Add padding between block and arrow
djsrv May 30, 2019
923dfb4
Fix comment widths
djsrv May 30, 2019
efba913
Implement help screen images
djsrv May 31, 2019
966febb
Temporary hack to fix help screen scrolling
djsrv May 31, 2019
d422fad
Add block thumbnail in top-left of help screen
djsrv May 31, 2019
c35c84e
Call changed() on help screen images after load
djsrv May 31, 2019
2f2ef96
Change help screen padding
djsrv May 31, 2019
fa8ae10
Add forward and bounceOffEdge screens
djsrv May 31, 2019
26be33e
Add bubble help screen
djsrv May 31, 2019
c0f787d
Add more help screens
djsrv Jun 4, 2019
1c55486
Allow gaps in annotation positioning
djsrv Jun 4, 2019
f9f64f3
Make arrows originate from annotation's first line
djsrv Jun 4, 2019
00a235f
Add reverse arrows in diagrams
djsrv Jun 4, 2019
0f89a34
Add custom block support to help screens
djsrv Jun 5, 2019
716352e
Fix help screen annotation positioning
djsrv Jun 5, 2019
a58e598
Add help screens
djsrv Jun 5, 2019
2979664
Add menu support to help screens
djsrv Jun 5, 2019
a94b620
Add more help screens
djsrv Jun 6, 2019
4363a1a
Add script diagram highlights and improved arrows
djsrv Jun 10, 2019
c31d4cb
Add result bubbles to script diagrams
djsrv Jun 10, 2019
a8b5218
Allow images in result bubbles
djsrv Jun 13, 2019
ef63cf6
Allow morph position to be specified manually
djsrv Jun 13, 2019
737f30d
Fixes to help screen layout
djsrv Jun 13, 2019
80569b4
Colored text in help screens
djsrv Jun 13, 2019
7e7d535
Allow Booleans in help screen result bubbles
djsrv Jun 13, 2019
14125eb
Move more help screen code to help.js
djsrv Jun 17, 2019
6e032d8
Move help code to libraries
djsrv Jun 24, 2019
fc6baed
Complete Help translator library
djsrv Jun 25, 2019
75648c2
Add help screen sources
djsrv Jun 25, 2019
d557f4a
Merge branch 'master' into help-screens
djsrv Jun 25, 2019
938ec12
Move old help files
djsrv Jun 25, 2019
a29dda3
Update Help translator library
djsrv Jun 25, 2019
fe1d2fa
Add new rendered help screens
djsrv Jun 25, 2019
0567bf1
Avoid caching help screen sources
djsrv Jun 25, 2019
dbe76ae
Add guide on translating help screens
djsrv Jun 25, 2019
44e4ecf
Fix script diagram fixLayout
djsrv Jul 4, 2019
765f3b3
Allow blocks to be ghosted in help screens
djsrv Jul 4, 2019
ce450b5
Add more help screens
djsrv Jul 4, 2019
ac7078a
Add black box for doWarp help screen
djsrv Jul 13, 2019
4e3eac4
Add script scaling to help screens
djsrv Jul 13, 2019
9b28fdb
Prevent arrow overlap in diagrams
djsrv Jul 13, 2019
5d47fe5
Help screen cleanup
djsrv Jul 13, 2019
a44bba0
Allow list inputs to be annotated in diagrams
djsrv Jul 13, 2019
5026c10
Add error handling to help screen blocks
djsrv Jul 13, 2019
c2187cb
Add more help screens
djsrv Jul 13, 2019
cd71495
Merge branch 'master' into help-screens
djsrv Jul 15, 2019
53839f8
Fix a comment
djsrv Jul 16, 2019
d4c3fb1
Add shadows to bubbles in diagrams
djsrv Jul 16, 2019
121bf4e
Fix a bug with bubbles in diagrams
djsrv Jul 16, 2019
b447a2f
Update help screens
djsrv Jul 16, 2019
b7dd5a4
Add documentation of help screen XML
djsrv Jul 16, 2019
ca4b1ef
Lint and license help.js
djsrv Jul 16, 2019
eae4167
Fix XML.md
djsrv Jul 16, 2019
a74a39a
Capitalize title of TRANSLATING.md
djsrv Jul 31, 2019
2e68116
Apply suggested improvements to TRANSLATING.md
djsrv Jul 31, 2019
6494d75
Replace whitespace instead of split+join in help.js
djsrv Jul 31, 2019
0d24966
Remove or rename variables named "screen"
djsrv Jul 31, 2019
9e56c0a
Rename processText to normalizeWhitespace
djsrv Jul 31, 2019
076c933
Use ide.resourceURL to get image resource URL
djsrv Jul 31, 2019
752d1f6
Rename TRANSLATING.md to README.md
djsrv Jul 31, 2019
29a7b85
Make early return in showBubble clearer
djsrv Aug 4, 2019
624d81d
Fix to last commit
djsrv Aug 4, 2019
283a82c
Combine loading of old and new help screens
djsrv Aug 4, 2019
5c2a076
Load blocks from libraries in help screens
djsrv Aug 8, 2019
9a835f2
Fix script-in-script arrows in diagrams
djsrv Aug 8, 2019
4f81b96
Update help screen font with libre alternative
djsrv Dec 5, 2019
1e47a34
Make sure help screens are rendered at double size
djsrv Dec 19, 2019
b5cba01
Fix help screen typos
djsrv Dec 19, 2019
0fc129e
help screen changes
brianharvey Dec 22, 2019
631cc8b
more help screens
brianharvey Dec 22, 2019
1d4d280
zillions of little help screen fixes
brianharvey Dec 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change help screen padding
djsrv committed May 31, 2019
commit 2f2ef965ebec8ca291748448a78784726d661b03
16 changes: 12 additions & 4 deletions src/help.js
Original file line number Diff line number Diff line change
@@ -106,12 +106,12 @@ HelpScreenMorph.prototype.init = function () {
};

HelpScreenMorph.prototype.fixLayout = function () {
var padding = this.padding, nextY = padding,
var padding = this.padding, nextY = padding / 3,
thumbnail = this.thumbnail;
function resizeBox (box) {
var startX, startY, width = 0, height = 0;
if (box !== thumbnail) {
box.moveBy(new Point(padding, nextY));
box.moveBy(new Point(0, nextY));
}
startX = box.left();
startY = box.top();
@@ -167,11 +167,19 @@ HelpScreenMorph.prototype.createRow = function () {
};

HelpScreenMorph.prototype.createParagraph = function (text) {
return new TextMorph(text, 18, 'serif', false, false, null, null, 'Baskerville');
var text = new TextMorph(
text, 18, 'serif', false, false, null, null, 'Baskerville'
);
text.color = 'white';
return text;
};

HelpScreenMorph.prototype.createRichParagraph = function (text) {
return new RichTextMorph(text, 18, 'serif', false, false, null, null, 'Baskerville');
var text = new TextMorph(
text, 18, 'serif', false, false, null, null, 'Baskerville'
);
text.color = 'white';
return text;
};

HelpScreenMorph.prototype.createScriptDiagram = function (script, annotations) {
5 changes: 3 additions & 2 deletions src/store.js
Original file line number Diff line number Diff line change
@@ -1677,9 +1677,10 @@ SnapSerializer.prototype.loadHelpScreen = function (xmlString, target) {

function fixWidths (morph) {
var parent = morph.parent;
if (
if (morph instanceof BoxMorph) {
morph.setWidth(parent.width() - padding);
} else if (
morph instanceof AlignmentMorph
|| morph instanceof BoxMorph
|| morph instanceof ScriptDiagramMorph
|| morph instanceof TextMorph
) {