Skip to content

RTL positioning for category labels and buttons in the flyout. #1668

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.

Sign up for GitHub

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

Merged
chrisgarrity merged 1 commit into from
Aug 2, 2018
Merged

RTL positioning for category labels and buttons in the flyout. #1668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion core/flyout_extension_category_header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ Blockly.FlyoutExtensionCategoryHeader.prototype.createDom = function() {
var marginX = 15;
var marginY = 10;

var statusButtonX = (this.flyoutWidth_ - statusButtonWidth - marginX) / this.workspace_.scale;
var statusButtonX = this.workspace_.RTL ? (marginX - this.flyoutWidth_ + statusButtonWidth) :
(this.flyoutWidth_ - statusButtonWidth - marginX) / this.workspace_.scale;

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view


if (this.imageSrc_) {
/** @type {SVGElement} */
Expand Down
6 changes: 5 additions & 1 deletion core/flyout_vertical.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,11 @@ Blockly.VerticalFlyout.prototype.layout_ = function(contents, gaps) {
} else if (item.type == 'button') {
var button = item.button;
var buttonSvg = button.createDom();
button.moveTo(cursorX, cursorY);
if (this.RTL) {
button.moveTo(flyoutWidth - this.MARGIN - button.width, cursorY);
} else {
button.moveTo(cursorX, cursorY);
}
button.show();
// Clicking on a flyout button or label is a lot like clicking on the
// flyout background.
Expand Down