Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion fcitx5
Submodule fcitx5 updated 48 files
+1 −1 CMakeLists.txt
+18 −17 po/ca.po
+18 −17 po/da.po
+18 −17 po/de.po
+18 −17 po/es.po
+18 −17 po/fcitx5.pot
+19 −18 po/fr.po
+18 −17 po/he.po
+15 −15 po/ja.po
+20 −19 po/ko.po
+19 −19 po/ru.po
+18 −17 po/vi.po
+20 −19 po/zh_CN.po
+19 −18 po/zh_TW.po
+1 −1 src/frontend/waylandim/waylandim.h
+1 −1 src/frontend/waylandim/waylandimserverv2.cpp
+1 −1 src/lib/fcitx-config/configuration.cpp
+2 −2 src/lib/fcitx-utils/dbus/bus.h
+1 −1 src/lib/fcitx-utils/dbus/servicewatcher.h
+1 −1 src/lib/fcitx-utils/eventloopinterface.h
+1 −1 src/lib/fcitx-utils/fs.cpp
+2 −2 src/lib/fcitx-utils/inputbuffer.h
+1 −1 src/lib/fcitx-utils/keylist
+1 −1 src/lib/fcitx-utils/keysymgen.h
+1 −1 src/lib/fcitx-utils/signals.h
+1 −1 src/lib/fcitx-utils/unixfd.h
+1 −1 src/lib/fcitx-utils/uuid_p.h
+1 −1 src/lib/fcitx-wayland/input-method-v2/input-method-unstable-v2.xml
+1 −1 src/lib/fcitx/action.h
+1 −1 src/lib/fcitx/candidatelist.h
+1 −1 src/lib/fcitx/inputcontextmanager.h
+2 −2 src/lib/fcitx/inputcontextproperty.h
+1 −1 src/lib/fcitx/inputmethodentry.h
+1 −1 src/lib/fcitx/inputmethodmanager.cpp
+1 −1 src/lib/fcitx/inputmethodmanager.h
+1 −1 src/lib/fcitx/userinterfacemanager.h
+2 −2 src/modules/clipboard/waylandclipboard.h
+1 −1 src/modules/notificationitem/dbusmenu.cpp
+31 −5 src/modules/notificationitem/notificationitem.cpp
+2 −1 src/modules/notificationitem/notificationitem.h
+1 −1 src/modules/spell/spell-custom-dict.cpp
+30 −2 src/modules/wayland/waylandmodule.cpp
+1 −1 src/modules/xcb/xcbconnection.cpp
+2 −2 src/ui/classic/theme.cpp
+1 −1 src/ui/classic/waylandcursor.cpp
+1 −1 src/ui/classic/xcbmenu.cpp
+2 −2 src/ui/classic/xcbtraywindow.cpp
+1 −1 src/ui/kimpanel/kimpanel.cpp
8 changes: 5 additions & 3 deletions iosnotifications/notify.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
public func showTip(_ icon: String, _ body: String, _ timeout: Int32) {
guard let showToastCallback = showToastCallback else {
return
Task { @MainActor in
guard let showToastCallback = showToastCallback else {
return
}
showToastCallback(icon, body, timeout)
}
showToastCallback(icon, body, timeout)
}
2 changes: 2 additions & 0 deletions iosnotifications/toast.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@MainActor
var showToastCallback: ((String, String, Int32) -> Void)?

@MainActor
public func setShowToastCallback(_ callback: @escaping (String, String, Int32) -> Void) {
showToastCallback = callback
}
18 changes: 8 additions & 10 deletions src/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,14 @@ struct ContentView: View {
try? "".write(
to: documents.appendingPathComponent("placeholder"), atomically: true, encoding: .utf8)
setShowToastCallback({ icon, message, duration in
DispatchQueue.main.async {
self.duration = Double(duration) / 1000.0
self.message = message
self.icon = icon
if icon == "running" {
self.showLoadingToast = true
} else {
self.showLoadingToast = false
self.showToast = true
}
self.duration = Double(duration) / 1000.0
self.message = message
self.icon = icon
if icon == "running" {
self.showLoadingToast = true
} else {
self.showLoadingToast = false
self.showToast = true
}
})
viewModel.refresh()
Expand Down