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.

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

Fix display leftover #74

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Fix display leftover #74

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: 3 additions & 0 deletions include/webview_candidate_window.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#else
#include "webview.h"
#endif
#include <cstdint>
#include <iostream>
#include <nlohmann/json.hpp>
#include <sstream>
Expand Down Expand Up @@ -67,6 +68,8 @@ class WebviewCandidateWindow : public CandidateWindow {
int accent_color_ = 0;
layout_t layout_ = layout_t::horizontal;
writing_mode_t writing_mode_ = writing_mode_t::horizontal_tb;
uint32_t epoch = 0; // A timestamp for async results from
// webview

private:
/* Platform-specific interfaces (implemented in 'platform') */
Expand Down
4 changes: 2 additions & 2 deletions page/global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ declare global {
_scroll: (start: number, length: number) => void
_askActions: (index: number) => void
_action: (index: number, id: number) => void
_resize: (dx: number, dy: number, anchorTop: number, anchorRight: number, anchorBottom: number, anchorLeft: number, panelTop: number, panelRight: number, panelBottom: number, panelLeft: number, panelRadius: number, borderWidth: number, fullWidth: number, fullHeight: number, dragging: boolean) => void
_resize: (epoch: number, dx: number, dy: number, anchorTop: number, anchorRight: number, anchorBottom: number, anchorLeft: number, panelTop: number, panelRight: number, panelBottom: number, panelLeft: number, panelRadius: number, borderWidth: number, fullWidth: number, fullHeight: number, dragging: boolean) => void

// JavaScript APIs that webview_candidate_window.mm calls
setCandidates: (cands: Candidate[], highlighted: number, markText: string, pageable: boolean, hasPrev: boolean, hasNext: boolean, scrollState: SCROLL_STATE, scrollStart: boolean, scrollEnd: boolean) => void
setLayout: (layout: 0 | 1) => void
updateInputPanel: (preeditHTML: string, auxUpHTML: string, auxDownHTML: string) => void
resize: (dx: number, dy: number, dragging: boolean, hasContextmenu: boolean) => void
resize: (new_epoch: number, dx: number, dy: number, dragging: boolean, hasContextmenu: boolean) => void
setTheme: (theme: 0 | 1 | 2) => void
setAccentColor: (color: number | null) => void
setStyle: (style: string) => void
Expand Down
9 changes: 6 additions & 3 deletions page/ux.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {

const DRAG_THRESHOLD = 10

let epoch = 0
let pressed = false
let dragging = false
let startX = 0
Expand All @@ -37,11 +38,13 @@ interface ShadowBox {
}

export function resize(
new_epoch: number,
dx: number,
dy: number,
dragging: boolean,
hasContextmenu: boolean,
) {
epoch = new_epoch
function adaptWindowSize(reserveSpaceForContextmenu: boolean) {
let {
anchorTop,
Expand Down Expand Up @@ -85,7 +88,7 @@ export function resize(
const { borderRadius, borderWidth } = getComputedStyle(panel)
const bWidth = Math.max(...borderWidth.split(' ').map(Number.parseFloat))
const pRadius = Math.max(...borderRadius.split(' ').map(Number.parseFloat))
window.fcitx._resize(dx, dy, anchorTop, anchorRight, anchorBottom, anchorLeft, pRect.top, pRect.right, pRect.bottom, pRect.left, pRadius, bWidth, right, bottom, dragging)
window.fcitx._resize(epoch, dx, dy, anchorTop, anchorRight, anchorBottom, anchorLeft, pRect.top, pRect.right, pRect.bottom, pRect.left, pRadius, bWidth, right, bottom, dragging)
}
adaptWindowSize(hasContextmenu)
if (!dragging) {
Expand Down Expand Up @@ -165,7 +168,7 @@ export function showContextmenu(x: number, y: number, index: number, actions: Ca
contextmenu.style.top = `${y}px`
contextmenu.style.left = `${x}px`
contextmenu.style.display = 'block'
resize(0, 0, false, true)
resize(epoch, 0, 0, false, true)
}

export function hideContextmenu() {
Expand Down Expand Up @@ -207,7 +210,7 @@ receiver.addEventListener('mousemove', (e) => {
dX += dx
dY += dy
dragOffset = Math.max(dragOffset, dX * dX + dY * dY)
resize(dx, dy, true, false)
resize(epoch, dx, dy, true, false)
})

receiver.addEventListener('mouseup', (e) => {
Expand Down
5 changes: 4 additions & 1 deletion src/platform/js.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ void WebviewCandidateWindow::set_transparent_background() {}

void WebviewCandidateWindow::update_accent_color() {}

void WebviewCandidateWindow::hide() { EM_ASM(fcitx.hidePanel()); }
void WebviewCandidateWindow::hide() {
EM_ASM(fcitx.hidePanel());
epoch += 1;
}

void WebviewCandidateWindow::write_clipboard(const std::string &html) {}

Expand Down
2 changes: 1 addition & 1 deletion src/platform/linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void WebviewCandidateWindow::set_transparent_background() {

void WebviewCandidateWindow::update_accent_color() {}

void WebviewCandidateWindow::hide() {}
void WebviewCandidateWindow::hide() { epoch += 1; }

void WebviewCandidateWindow::write_clipboard(const std::string &html) {}

Expand Down
1 change: 1 addition & 0 deletions src/platform/macos.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ NSRect getNearestScreenFrame(double x, double y) {
[window orderBack:nil];
[window setIsVisible:NO];
hidden_ = true;
epoch += 1;
}

void WebviewCandidateWindow::write_clipboard(const std::string &html) {
Expand Down
19 changes: 13 additions & 6 deletions src/webview_candidate_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,17 @@ WebviewCandidateWindow::WebviewCandidateWindow()
update_accent_color();

bind("_resize",
[this](double dx, double dy, double anchor_top, double anchor_right,
double anchor_bottom, double anchor_left, double panel_top,
double panel_right, double panel_bottom, double panel_left,
double panel_radius, double border_width, double width,
double height, bool dragging) {
[this](uint32_t result_epoch, double dx, double dy, double anchor_top,
double anchor_right, double anchor_bottom, double anchor_left,
double panel_top, double panel_right, double panel_bottom,
double panel_left, double panel_radius, double border_width,
double width, double height, bool dragging) {
// Drop results from previous epochs. This can happen
// because JS code runs in another thread and can be slow
// sometimes.
// NOTE: accept result_epoch=0 because of wrapping.
if (result_epoch != 0 && result_epoch < epoch)
return;
resize(dx, dy, anchor_top, anchor_right, anchor_bottom,
anchor_left, panel_top, panel_right, panel_bottom,
panel_left, panel_radius, border_width, width, height,
Expand Down Expand Up @@ -144,7 +150,8 @@ void WebviewCandidateWindow::show(double x, double y) {
// warmed-up yet, and it won't be updated until user changes color.
set_accent_color();
}
invoke_js("resize", 0., 0., false);
epoch += 1;
invoke_js("resize", epoch, 0., 0., false);
}

static void build_html_open_tags(std::stringstream &ss, int flags) {
Expand Down
2 changes: 1 addition & 1 deletion tests/global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
declare global {
type CppCall = {
resize: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, boolean]
resize: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, boolean]
} | {
select: number
} | {
Expand Down
4 changes: 2 additions & 2 deletions tests/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export async function init(page: Page) {
await page.evaluate(() => {
window.fcitx.setTheme(2)
window.cppCalls = []
window.fcitx._resize = (dx: number, dy: number, anchorTop: number, anchorRight: number, anchorBottom: number, anchorLeft: number, panelTop: number, panelRight: number, panelBottom: number, panelLeft: number, panelRadius: number, borderWidth: number, fullWidth: number, fullHeight: number, dragging: boolean) => {
window.fcitx._resize = (epoch: number, dx: number, dy: number, anchorTop: number, anchorRight: number, anchorBottom: number, anchorLeft: number, panelTop: number, panelRight: number, panelBottom: number, panelLeft: number, panelRadius: number, borderWidth: number, fullWidth: number, fullHeight: number, dragging: boolean) => {
window.cppCalls.push({
resize: [dx, dy, anchorTop, anchorRight, anchorBottom, anchorLeft, panelTop, panelRight, panelBottom, panelLeft, panelRadius, borderWidth, fullWidth, fullHeight, dragging],
resize: [epoch, dx, dy, anchorTop, anchorRight, anchorBottom, anchorLeft, panelTop, panelRight, panelBottom, panelLeft, panelRadius, borderWidth, fullWidth, fullHeight, dragging],
})
}
window.fcitx._select = (index: number) => {
Expand Down