forked from Blendman974/faceclaw
Merge branch 'main' of https://github.com/jimrandomh/faceclaw into android-wear-integration
# Conflicts: # app/phone-ui/main-page.xml # app/phone-ui/main-view-model.ts
This commit is contained in:
commit
646335cb64
63 files changed
+1296
-621
No files matched your search
@@ -387,7 +387,7 @@ function renderAbout(args: { image: GrayImage; x: number; y: number; width: numb
|
||||
const textX = logo ? x + logo.width + 12 : x;
|
||||
image.drawText(font, textX, y + 8, "Faceclaw", 220);
|
||||
image.drawText(font, textX, y + 24, `v${FACECLAW_VERSION}`, 170);
|
||||
const blurb = "By James Babcock. Distributed under the GNU General Public License, version 3.";
|
||||
const blurb = "By James Babcock and other contributors. Distributed under the GNU General Public License, version 3.";
|
||||
const blurbY = y + Math.max(64, logo ? logo.height + 12 : 0);
|
||||
const blurbLines = wrapText(font, blurb, width);
|
||||
for (let i = 0; i < blurbLines.length; i++) {
|
||||
|
||||
@@ -1145,8 +1145,8 @@ export function rawInputEventToInputEvent(event: RawInputEvent): DashboardInputE
|
||||
return scrollEvent("scroll-up", event.eventSource);
|
||||
} else if (event.eventType === OsEventTypeList.RING_LONG_PRESS_EVENT) {
|
||||
// CFW-forwarded long-press (replaces the firmware's force-quit dialog).
|
||||
// The CFW gates this to the ring, so eventSource may be 0 (unknown);
|
||||
// eventSourceToString falls back to "ring".
|
||||
// Current CFW supplies the physical source for ring and temple presses;
|
||||
// eventSourceToString's ring fallback keeps older CFW builds compatible.
|
||||
return { type: "long-press", source: eventSourceToString(event.eventSource) };
|
||||
} else if (event.eventType === OsEventTypeList.RING_LONG_PRESS_RELEASE_EVENT) {
|
||||
return { type: "long-press-release", source: eventSourceToString(event.eventSource) };
|
||||
|
||||
Reference in new issue
Block a user