From 987c71941f963af8b7e88e1096ffafa6d52d7444 Mon Sep 17 00:00:00 2001 From: DuanRay Date: Tue, 17 Oct 2023 09:30:53 +0800 Subject: [PATCH 1/3] update 0001 patch --- 0001-resolve-moving-window-jitter.patch | 66 +++++++++++++++++++++---- 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/0001-resolve-moving-window-jitter.patch b/0001-resolve-moving-window-jitter.patch index 5553aaa..4abbdbc 100644 --- a/0001-resolve-moving-window-jitter.patch +++ b/0001-resolve-moving-window-jitter.patch @@ -1,7 +1,54 @@ -diff -u a/src/page/mainpage.cpp b/src/page/mainpage.cpp ---- a/src/page/mainpage.cpp 2023-08-24 19:23:10.000000000 +0800 -+++ b/src/page/mainpage.cpp 2023-09-08 16:28:40.449563913 +0800 -@@ -760,15 +760,11 @@ +diff --git a/0001-resolve-moving-window-jitter.patch b/0001-resolve-moving-window-jitter.patch +index 5553aaa..e69de29 100644 +--- a/0001-resolve-moving-window-jitter.patch ++++ b/0001-resolve-moving-window-jitter.patch +@@ -1,41 +0,0 @@ +-diff -u a/src/page/mainpage.cpp b/src/page/mainpage.cpp +---- a/src/page/mainpage.cpp 2023-08-24 19:23:10.000000000 +0800 +-+++ b/src/page/mainpage.cpp 2023-09-08 16:28:40.449563913 +0800 +-@@ -760,15 +760,11 @@ +- ui->frame_resize->setEnabled(state == 2); +- } +- +--void MainPage::mousePressEvent(QMouseEvent *event) { +-- current = event->pos(); +--} +-- +- void MainPage::mouseMoveEvent(QMouseEvent *event) { +- if (pressed) +- { +-- QPoint deltaPos = event->pos() - current; +-- this->move(mapToParent(deltaPos)); +-+ QPoint deltaPos = event->globalPos() - current; +-+ move(deltaPos); +- std::cout<pos().x()<titleFrame && event->type() == QEvent::MouseButtonPress) { +- QMouseEvent* mouseEvent = (QMouseEvent*)event; +- if (pressed == false) { +-- current = mouseEvent->pos(); +-+ current = mouseEvent->globalPos() - this->pos(); +- } +- pressed = true; +- return true; +-diff -u a/src/page/mainpage.h b/src/page/mainpage.h +---- a/src/page/mainpage.h 2023-08-10 10:31:55.000000000 +0800 +-+++ b/src/page/mainpage.h 2023-09-08 16:31:02.889133773 +0800 +-@@ -63,7 +63,6 @@ +- void set_widget_icon(QWidget *qw, QString icon, QString hover); +- void update_time(QString time); +- +-- void mousePressEvent(QMouseEvent *event); +- void mouseMoveEvent(QMouseEvent *event); +- bool eventFilter(QObject *object, QEvent *event); +- QPoint current; +diff --git a/nfs-screen-recorder-0.4.2/src/page/mainpage.cpp b/nfs-screen-recorder-0.4.2/src/page/mainpage.cpp +index 11180bb..54eee04 100644 +--- a/nfs-screen-recorder-0.4.2/src/page/mainpage.cpp ++++ b/nfs-screen-recorder-0.4.2/src/page/mainpage.cpp +@@ -760,15 +760,11 @@ void MainPage::on_zoomCheckBox_stateChanged(int state) { ui->frame_resize->setEnabled(state == 2); } @@ -19,7 +66,7 @@ diff -u a/src/page/mainpage.cpp b/src/page/mainpage.cpp std::cout<pos().x()<titleFrame && event->type() == QEvent::MouseButtonPress) { QMouseEvent* mouseEvent = (QMouseEvent*)event; if (pressed == false) { @@ -28,10 +75,11 @@ diff -u a/src/page/mainpage.cpp b/src/page/mainpage.cpp } pressed = true; return true; -diff -u a/src/page/mainpage.h b/src/page/mainpage.h ---- a/src/page/mainpage.h 2023-08-10 10:31:55.000000000 +0800 -+++ b/src/page/mainpage.h 2023-09-08 16:31:02.889133773 +0800 -@@ -63,7 +63,6 @@ +diff --git a/nfs-screen-recorder-0.4.2/src/page/mainpage.h b/nfs-screen-recorder-0.4.2/src/page/mainpage.h +index 5122a83..c1f070e 100644 +--- a/nfs-screen-recorder-0.4.2/src/page/mainpage.h ++++ b/nfs-screen-recorder-0.4.2/src/page/mainpage.h +@@ -63,7 +63,6 @@ public: void set_widget_icon(QWidget *qw, QString icon, QString hover); void update_time(QString time); -- Gitee From 892a3b489e8f4f475ef93bd04ee56b9579d6866b Mon Sep 17 00:00:00 2001 From: DuanRay Date: Tue, 17 Oct 2023 09:42:24 +0800 Subject: [PATCH 2/3] chore:update 0001 patch content --- 0001-resolve-moving-window-jitter.patch | 46 ------------------------- 1 file changed, 46 deletions(-) diff --git a/0001-resolve-moving-window-jitter.patch b/0001-resolve-moving-window-jitter.patch index 4abbdbc..c095d29 100644 --- a/0001-resolve-moving-window-jitter.patch +++ b/0001-resolve-moving-window-jitter.patch @@ -1,49 +1,3 @@ -diff --git a/0001-resolve-moving-window-jitter.patch b/0001-resolve-moving-window-jitter.patch -index 5553aaa..e69de29 100644 ---- a/0001-resolve-moving-window-jitter.patch -+++ b/0001-resolve-moving-window-jitter.patch -@@ -1,41 +0,0 @@ --diff -u a/src/page/mainpage.cpp b/src/page/mainpage.cpp ----- a/src/page/mainpage.cpp 2023-08-24 19:23:10.000000000 +0800 --+++ b/src/page/mainpage.cpp 2023-09-08 16:28:40.449563913 +0800 --@@ -760,15 +760,11 @@ -- ui->frame_resize->setEnabled(state == 2); -- } -- ---void MainPage::mousePressEvent(QMouseEvent *event) { --- current = event->pos(); ---} --- -- void MainPage::mouseMoveEvent(QMouseEvent *event) { -- if (pressed) -- { --- QPoint deltaPos = event->pos() - current; --- this->move(mapToParent(deltaPos)); --+ QPoint deltaPos = event->globalPos() - current; --+ move(deltaPos); -- std::cout<pos().x()<titleFrame && event->type() == QEvent::MouseButtonPress) { -- QMouseEvent* mouseEvent = (QMouseEvent*)event; -- if (pressed == false) { --- current = mouseEvent->pos(); --+ current = mouseEvent->globalPos() - this->pos(); -- } -- pressed = true; -- return true; --diff -u a/src/page/mainpage.h b/src/page/mainpage.h ----- a/src/page/mainpage.h 2023-08-10 10:31:55.000000000 +0800 --+++ b/src/page/mainpage.h 2023-09-08 16:31:02.889133773 +0800 --@@ -63,7 +63,6 @@ -- void set_widget_icon(QWidget *qw, QString icon, QString hover); -- void update_time(QString time); -- --- void mousePressEvent(QMouseEvent *event); -- void mouseMoveEvent(QMouseEvent *event); -- bool eventFilter(QObject *object, QEvent *event); -- QPoint current; diff --git a/nfs-screen-recorder-0.4.2/src/page/mainpage.cpp b/nfs-screen-recorder-0.4.2/src/page/mainpage.cpp index 11180bb..54eee04 100644 --- a/nfs-screen-recorder-0.4.2/src/page/mainpage.cpp -- Gitee From dd9f4ed588f3dd1fd466573eec85116bf8555694 Mon Sep 17 00:00:00 2001 From: DuanRay Date: Tue, 17 Oct 2023 10:28:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=E6=A0=B9=E6=8D=AE=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=86=B3=E5=AE=9A=E5=BF=AB=E6=8D=B7=E9=94=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0003-shift-app-name-via-system-language.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 0003-shift-app-name-via-system-language.patch diff --git a/0003-shift-app-name-via-system-language.patch b/0003-shift-app-name-via-system-language.patch new file mode 100644 index 0000000..b67c0b6 --- /dev/null +++ b/0003-shift-app-name-via-system-language.patch @@ -0,0 +1,13 @@ +diff --git a/nfs-screen-recorder-0.4.2/data/simplescreenrecorder.desktop b/nfs-screen-recorder-0.4.2/data/simplescreenrecorder.desktop +index a063349..908b2b7 100755 +--- a/nfs-screen-recorder-0.4.2/data/simplescreenrecorder.desktop ++++ b/nfs-screen-recorder-0.4.2/data/simplescreenrecorder.desktop +@@ -1,6 +1,7 @@ + [Desktop Entry] + Type=Application +-Name=方德录屏 ++Name=NfsScreenRecorder ++Name[zh_CN]=方德录屏 + Comment=A feature-rich screen recorder that supports X11 and OpenGL + Comment[de]=Ein funktionsreicher Bildschirmrekorder, der X11 und OpenGL unterstützt + Comment[fr]=Un captureur d'écran complet qui supporte X11 et OpenGL -- Gitee