[widclkinfo] Ensure we cancel focus when widget_utils.swipeOn() pushes widget bar off screen #3680
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| 0.01: New Widget! | ||
| 0.02: Now use an app ID (to avoid conflicts with clocks that also use ClockInfo) | ||
| 0.03: Fix widget clearing too far down | ||
| 0.04: If a small font is needed, use 6x8 but twice as high | ||
| 0.05: Defocus the clock_info if widget_utils is used to move widgets off screen |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,50 +1,93 @@ | ||||||
| (() => { | ||||||
| if (!require("clock_info").loadCount) { // don't load if a clock_info was already loaded | ||||||
| const clock_info = require("clock_info"); | ||||||
|
|
||||||
| WIDGETS["clkinfo"] = { | ||||||
| area: "tl", | ||||||
| width: 0, //this.clockInfoMenu.w, | ||||||
| init: function() { | ||||||
| this.width = this.clockInfoMenu.w; | ||||||
| delete this.init; | ||||||
| return this; | ||||||
| }, | ||||||
|
Comment on lines
+8
to
+12
There was a problem hiding this comment. Do we need this function? Can we set |
||||||
| clockInfoInfo: undefined, // defined during clockInfoMenu.draw() | ||||||
|
There was a problem hiding this comment. Perhaps we give this a less repeating name
Suggested change
|
||||||
| clockInfoMenu: clock_info.addInteractive(clock_info.load(), { | ||||||
| app: "widclkinfo", | ||||||
| // Add the dimensions we're rendering to here - these are used to detect taps on the clock info area | ||||||
| x: 0, | ||||||
| y: 0, // TODO how know if offscreen to start? | ||||||
| w: 72, | ||||||
| h: 23, // workaround off by one error in clock_info | ||||||
| // You can add other information here you want to be passed into 'options' in 'draw' | ||||||
| // This function draws the info | ||||||
| draw: (itm, info, options) => { | ||||||
| // itm: the item containing name/hasRange/etc | ||||||
| // info: data returned from itm.get() containing text/img/etc | ||||||
| // options: options passed into addInteractive | ||||||
| var wi = WIDGETS["clkinfo"]; | ||||||
| wi.clockInfoInfo = info; | ||||||
|
There was a problem hiding this comment. Where does this variable come from? ( |
||||||
| wi.clockInfoMenu.y = options.y; | ||||||
| if (WIDGETS["clkinfo"] && wi.clockInfoMenu.y > -24) { | ||||||
| WIDGETS["clkinfo"].draw(WIDGETS["clkinfo"]); | ||||||
|
Comment on lines
+27
to
+31
There was a problem hiding this comment. Any way to not refer to the global values here? |
||||||
| } | ||||||
| } | ||||||
| }), | ||||||
| draw: function(e) { | ||||||
| this.clockInfoMenu.x = e.x; | ||||||
| var o = this.clockInfoMenu; | ||||||
| g.reset(); | ||||||
| // indicate focus | ||||||
| if (this.clockInfoMenu.focus) { | ||||||
| g.setColor("#f00"); | ||||||
| } | ||||||
| g.clearRect(o.x, o.y, o.x + o.w - 1, o.y + o.h - 1); | ||||||
| if (this.clockInfoInfo) { | ||||||
| var x = o.x; | ||||||
| if (this.clockInfoInfo.img) { | ||||||
| g.drawImage(this.clockInfoInfo.img, x, o.y); // draw the image | ||||||
| x += 24; | ||||||
| } | ||||||
| var availableWidth = o.x + this.clockInfoMenu.w - (x + 2); | ||||||
| g.setFont("6x8:2").setFontAlign(-1, 0); | ||||||
| if (g.stringWidth(this.clockInfoInfo.text) > availableWidth) | ||||||
| g.setFont("6x8:1x2"); | ||||||
| g.drawString(this.clockInfoInfo.text, x + 2, o.y + 12); // draw the text | ||||||
| } | ||||||
| } | ||||||
| }.init(); | ||||||
|
|
||||||
| // We make clock info touch area active on the start of the animation | ||||||
| Bangle.on("widgets-start-show", () => { | ||||||
| var wi = WIDGETS["clkinfo"]; | ||||||
| if (wi) { | ||||||
| wi.clockInfoMenu.y = 0; | ||||||
| wi.draw(wi); | ||||||
| } | ||||||
| }); | ||||||
|
|
||||||
| Bangle.on("widgets-shown", () => { | ||||||
| var wi = WIDGETS["clkinfo"]; | ||||||
| if (wi) { | ||||||
| wi.clockInfoMenu.y = 0; | ||||||
| wi.draw(wi); | ||||||
| } | ||||||
| }); | ||||||
|
Comment on lines
+68
to
+74
There was a problem hiding this comment. Is this the same as the callback for |
||||||
|
|
||||||
| Bangle.on("widgets-start-hide", () => { | ||||||
| var wi = WIDGETS["clkinfo"]; | ||||||
| if (wi) { | ||||||
| wi.clockInfoMenu.ensure_blur(); // let user see defocus cue before hiding | ||||||
| wi.clockInfoMenu.y = -24; | ||||||
| wi.draw(wi); | ||||||
| } | ||||||
| }); | ||||||
|
|
||||||
| Bangle.on("widgets-hidden", () => { | ||||||
| var wi = WIDGETS["clkinfo"]; | ||||||
| if (wi) { | ||||||
| wi.clockInfoMenu.ensure_blur(); | ||||||
| wi.clockInfoMenu.y = -24; | ||||||
| wi.draw(wi); | ||||||
| } | ||||||
| }); | ||||||
| }})() | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can have this have the same name to avoid users of the API knowing about internals: