parent
6836280f04
commit
2ca1efdada
|
@ -14,13 +14,13 @@ DBusService::~DBusService() { stopService(); }
|
|||
|
||||
void DBusService::initRequestMerger() {
|
||||
virtualKeyboardVisibilityRequestMerger_.init(
|
||||
[this]() { virtualKeyboardManager_->ShowVirtualKeyboard(); },
|
||||
[this]() { virtualKeyboardManager_->HideVirtualKeyboard(); },
|
||||
[this]() { virtualKeyboardManager_->showVirtualKeyboard(); },
|
||||
[this]() { virtualKeyboardManager_->hideVirtualKeyboard(); },
|
||||
[this]() {
|
||||
return !virtualKeyboardManager_->IsVirtualKeyboardVisible();
|
||||
return !virtualKeyboardManager_->isVirtualKeyboardVisible();
|
||||
},
|
||||
[this]() {
|
||||
return virtualKeyboardManager_->IsVirtualKeyboardVisible();
|
||||
return virtualKeyboardManager_->isVirtualKeyboardVisible();
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -45,32 +45,32 @@ void DBusService::HideVirtualKeyboard() {
|
|||
}
|
||||
|
||||
bool DBusService::IsVirtualKeyboardVisible() {
|
||||
return virtualKeyboardManager_->IsVirtualKeyboardVisible();
|
||||
return virtualKeyboardManager_->isVirtualKeyboardVisible();
|
||||
}
|
||||
|
||||
void DBusService::UpdatePreeditCaret(int preeditCursor) {
|
||||
virtualKeyboardManager_->UpdatePreeditCaret(preeditCursor);
|
||||
virtualKeyboardManager_->updatePreeditCaret(preeditCursor);
|
||||
}
|
||||
|
||||
void DBusService::UpdatePreeditArea(const QString &preeditText) {
|
||||
virtualKeyboardManager_->UpdatePreeditArea(preeditText);
|
||||
virtualKeyboardManager_->updatePreeditArea(preeditText);
|
||||
}
|
||||
|
||||
void DBusService::UpdateCandidateArea(const QStringList &candidateTextList,
|
||||
bool hasPrev, bool hasNext,
|
||||
int pageIndex) {
|
||||
virtualKeyboardManager_->UpdateCandidateArea(candidateTextList, hasPrev,
|
||||
virtualKeyboardManager_->updateCandidateArea(candidateTextList, hasPrev,
|
||||
hasNext, pageIndex);
|
||||
}
|
||||
|
||||
void DBusService::NotifyIMActivated(const QString &uniqueName) {
|
||||
virtualKeyboardManager_->NotifyIMActivated(uniqueName);
|
||||
virtualKeyboardManager_->notifyIMActivated(uniqueName);
|
||||
}
|
||||
|
||||
void DBusService::NotifyIMDeactivated(const QString &uniqueName) {
|
||||
virtualKeyboardManager_->NotifyIMDeactivated(uniqueName);
|
||||
virtualKeyboardManager_->notifyIMDeactivated(uniqueName);
|
||||
}
|
||||
|
||||
void DBusService::NotifyIMListChanged() {
|
||||
virtualKeyboardManager_->NotifyIMListChanged();
|
||||
virtualKeyboardManager_->notifyIMListChanged();
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ VirtualKeyboardManager::VirtualKeyboardManager(QObject *parent)
|
|||
}
|
||||
|
||||
VirtualKeyboardManager::~VirtualKeyboardManager() {
|
||||
HideVirtualKeyboard();
|
||||
hideVirtualKeyboard();
|
||||
|
||||
placementModeManager_.reset();
|
||||
floatGeometryManager_.reset();
|
||||
|
@ -28,58 +28,58 @@ VirtualKeyboardManager::~VirtualKeyboardManager() {
|
|||
model_.reset();
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::ShowVirtualKeyboard() {
|
||||
void VirtualKeyboardManager::showVirtualKeyboard() {
|
||||
if (virtualkeyboardVisible_) {
|
||||
return;
|
||||
}
|
||||
initView();
|
||||
virtualkeyboardVisible_ = true;
|
||||
VisibiltyChanged();
|
||||
visibiltyChanged();
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::HideVirtualKeyboard() {
|
||||
void VirtualKeyboardManager::hideVirtualKeyboard() {
|
||||
if (!virtualkeyboardVisible_) {
|
||||
return;
|
||||
}
|
||||
virtualkeyboardVisible_ = false;
|
||||
destoryView();
|
||||
VisibiltyChanged();
|
||||
visibiltyChanged();
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::VisibiltyChanged() {
|
||||
void VirtualKeyboardManager::visibiltyChanged() {
|
||||
emit virtualKeyboardVisibiltyChanged(virtualkeyboardVisible_);
|
||||
model_->processVisibilityEvent(virtualkeyboardVisible_);
|
||||
}
|
||||
|
||||
bool VirtualKeyboardManager::IsVirtualKeyboardVisible() const {
|
||||
bool VirtualKeyboardManager::isVirtualKeyboardVisible() const {
|
||||
return virtualkeyboardVisible_;
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::UpdatePreeditCaret(int index) {
|
||||
void VirtualKeyboardManager::updatePreeditCaret(int index) {
|
||||
emit model_->updatePreeditCaret(index);
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::UpdatePreeditArea(const QString &preeditText) {
|
||||
void VirtualKeyboardManager::updatePreeditArea(const QString &preeditText) {
|
||||
emit model_->updatePreeditArea(preeditText);
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::UpdateCandidateArea(
|
||||
void VirtualKeyboardManager::updateCandidateArea(
|
||||
const QStringList &candidateTextList, bool hasPrev, bool hasNext,
|
||||
int pageIndex) {
|
||||
emit model_->updateCandidateArea(QVariant(candidateTextList), hasPrev,
|
||||
hasNext, pageIndex);
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::NotifyIMActivated(const QString &uniqueName) {
|
||||
void VirtualKeyboardManager::notifyIMActivated(const QString &uniqueName) {
|
||||
emit model_->inputMethodNameArrived(uniqueName);
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::NotifyIMDeactivated(
|
||||
void VirtualKeyboardManager::notifyIMDeactivated(
|
||||
const QString & /*uniqueName*/) {
|
||||
emit model_->reset();
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::NotifyIMListChanged() {
|
||||
void VirtualKeyboardManager::notifyIMListChanged() {
|
||||
model_->syncInputMethodName();
|
||||
}
|
||||
|
||||
|
@ -142,7 +142,7 @@ void VirtualKeyboardManager::connectVirtualKeyboardModelSignals() {
|
|||
view_.get(), SIGNAL(updateCurrentIMList(const QVariant &)));
|
||||
|
||||
connect(model_.get(), SIGNAL(backendConnectionDisconnected()), this,
|
||||
SLOT(HideVirtualKeyboard()));
|
||||
SLOT(hideVirtualKeyboard()));
|
||||
}
|
||||
|
||||
void VirtualKeyboardManager::connectGeometryManagerSignals() {
|
||||
|
@ -160,7 +160,7 @@ void VirtualKeyboardManager::connectRootObjectSignals() {
|
|||
const auto *rootObject = view_->rootObject();
|
||||
|
||||
connect(rootObject, SIGNAL(qmlHideVirtualKeyboard()), this,
|
||||
SLOT(HideVirtualKeyboard()));
|
||||
SLOT(hideVirtualKeyboard()));
|
||||
|
||||
connect(rootObject, SIGNAL(qmlPlacementModeButtonClicked()),
|
||||
placementModeManager_.get(), SLOT(flipPlacementMode()));
|
||||
|
|
|
@ -20,22 +20,22 @@ public:
|
|||
explicit VirtualKeyboardManager(QObject *parent = nullptr);
|
||||
~VirtualKeyboardManager();
|
||||
|
||||
void ShowVirtualKeyboard();
|
||||
void VisibiltyChanged();
|
||||
bool IsVirtualKeyboardVisible() const;
|
||||
void UpdatePreeditCaret(int index);
|
||||
void UpdatePreeditArea(const QString &preeditText);
|
||||
void UpdateCandidateArea(const QStringList &candidateTextList, bool hasPrev,
|
||||
void showVirtualKeyboard();
|
||||
void visibiltyChanged();
|
||||
bool isVirtualKeyboardVisible() const;
|
||||
void updatePreeditCaret(int index);
|
||||
void updatePreeditArea(const QString &preeditText);
|
||||
void updateCandidateArea(const QStringList &candidateTextList, bool hasPrev,
|
||||
bool hasNext, int pageIndex);
|
||||
void NotifyIMActivated(const QString &uniqueName);
|
||||
void NotifyIMDeactivated(const QString &uniqueName);
|
||||
void NotifyIMListChanged();
|
||||
void notifyIMActivated(const QString &uniqueName);
|
||||
void notifyIMDeactivated(const QString &uniqueName);
|
||||
void notifyIMListChanged();
|
||||
|
||||
signals:
|
||||
void virtualKeyboardVisibiltyChanged(bool isShow);
|
||||
|
||||
public slots:
|
||||
void HideVirtualKeyboard();
|
||||
void hideVirtualKeyboard();
|
||||
|
||||
void processResolutionChangedEvent();
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ void TrayEntry::RegisterTrayEntry() {
|
|||
void TrayEntry::ActiveTray(QSystemTrayIcon::ActivationReason reason) {
|
||||
switch (reason) {
|
||||
case QSystemTrayIcon::Trigger: {
|
||||
virtualKeyboardManager_.IsVirtualKeyboardVisible()
|
||||
virtualKeyboardManager_.isVirtualKeyboardVisible()
|
||||
? virtualKeyboardService_.hideVirtualKeyboard()
|
||||
: virtualKeyboardService_.showVirtualKeyboard();
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue