Skip to content

fix: show touchscreen dialog on init #439

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

Merged
fly602 merged 1 commit into from
Jul 10, 2026
Merged

fix: show touchscreen dialog on init #439

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
10 changes: 1 addition & 9 deletions dde-touchscreen-dialog/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,7 @@ int main(int argc, char *argv[])
return -1;
}

// 如果该触摸设备已被关联到屏幕，则不再弹出选择窗口
const QString &touchUUID = posArguments.first();
const auto touchMap = display.touchMap();
if (touchMap.contains(touchUUID)) {
qDebug() << "touchscreen already associated:" << touchUUID << "->" << touchMap[touchUUID];
return 0;
}

TouchscreenSetting s(touchUUID);
TouchscreenSetting s(posArguments.first());
#if (defined QT_DEBUG) && (defined CHECK_ACCESSIBLENAME)
AccessibilityCheckerEx checker;
checker.setOutputFormat(DAccessibilityChecker::FullFormat);
Expand Down
8 changes: 0 additions & 8 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
export QT_SELECT=5

include /usr/share/dpkg/default.mk
SYSTYPE=Desktop
SYSTYPE=$(shell cat /etc/deepin-version | grep Type= | awk -F'=' '{print $$2}')
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall
export DEB_CXXFLAGS_MAINT_APPEND = -Wall
Expand Down Expand Up @@ -37,9 +35,3 @@ override_dh_auto_configure:
dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) SHUTDOWN_NO_QUIT=YES LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES
endif

ifeq ($(SYSTYPE), Professional)
ifeq ($(DEB_BUILD_ARCH), amd64)
override_dh_gencontrol:
dh_gencontrol -- -Vdist:Depends="pbis-open"
endif
endif
Loading