Skip to content

Commit 8b9706b

Browse files
committed
Script: modify wayland
1 parent fe3f13d commit 8b9706b

8 files changed

Lines changed: 17 additions & 12 deletions

File tree

App/Client/ViewSplitter.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,7 @@ int CViewSplitter::SetFullScreen(bool bFull)
284284
}
285285
}
286286
}
287-
}
288-
else {
287+
} else {
289288
setStyleSheet(m_szStyleSheet);
290289
m_pMain->setHandleWidth(m_HandleWidth);
291290
for(int i = 0; i < m_nRow; i++) {

App/Client/ViewTable.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ void CViewTable::SetWidowsTitle(QWidget* pView, const QString& szTitle,
145145
int CViewTable::SetFullScreen(bool bFull)
146146
{
147147
if(!m_pTab) return -1;
148-
if(bFull)
149-
{
148+
if(bFull) {
150149
m_szStyleSheet = m_pTab->styleSheet();
151150
SetVisibleTab(false);
152151
//qDebug(log) << m_szStyleSheet;

App/Client/mainwindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,8 @@ void MainWindow::on_actionFull_screen_F_triggered()
801801
<< "Primary screen available geometry:" << pScreen->availableGeometry()
802802
<< "Main window frameGeometry:" << frameGeometry()
803803
<< "Position:" << pos << "local position:" << mapFromGlobal(pos);
804-
// When platfrom is wayland, the widget is show, so the frameGeometry is right. the size is full screen.
805-
// When platfrom is x11, the widget is not show, so the frameGeometry is error. the size is old size.
804+
// When platform is wayland, the widget is show, so the frameGeometry is right. the size is full screen.
805+
// When platform is x11, the widget is not show, so the frameGeometry is error. the size is old size.
806806
// because the size of widget full screen is same the size of primary screen.
807807
// so that using the size of primary screen.
808808
m_pFullScreenToolBar->move(pos);

ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
- Modify
5959
- Application
6060
- Modify toolbar
61-
- Modify full screen tool bar backgroud color
61+
- Modify full screen tool bar background color
6262
- Fix
6363
- Application
6464
- Plugin: fix disable desktop shortcuts in linux. See: https://github.com/KangLin/RabbitRemoteControl/discussions/91

Package/Flatpak/io.github.KangLin.RabbitRemoteControl.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,19 @@ cleanup:
2626
- "/lib/pkgconfig"
2727
- "/share/licenses"
2828

29-
finish-args:
29+
finish-args: #See: https://docs.flatpak.org/en/latest/sandbox-permissions.html
3030
- --share=ipc
31+
# Needs to talk to the network
3132
- --share=network
33+
- --allow=bluetooth
3234
- --socket=pulseaudio
3335
- --socket=pcsc
3436
- --socket=ssh-auth
35-
- --socket=x11
37+
# Wayland access
38+
- --socket=wayland
39+
- --socket=fallback-x11
40+
# X11 + XShm access
41+
#- --socket=x11
3642
- --device=all
3743
- --filesystem=xdg-documents
3844
- --talk-name=org.freedesktop.Notifications
@@ -44,6 +50,7 @@ finish-args:
4450
- --filesystem=xdg-public-share
4551
- --filesystem=home:ro
4652
# https://github.com/flathub/io.qt.qtwebengine.BaseApp
53+
# GPU acceleration (OpenGL rendering)
4754
- --device=dri
4855
- --env=QTWEBENGINEPROCESS_PATH=/app/bin/QtWebEngineProcess
4956

Package/debian/control.ubuntu.24

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
1010
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
1111
qt6-scxml-dev, qt6-multimedia-dev, qt6-serialport-dev, qt6-websockets-dev,
1212
qt6-webengine-dev, qt6-webengine-dev-tools, qt6-positioning-dev, qt6-webchannel-dev,
13-
qt6-speech-dev,
13+
qt6-speech-dev, libqt6waylandclient6,
1414
libssl-dev, libcrypt-dev, libcmark-dev,
1515
freerdp2-dev, libvncserver-dev, libpcap-dev,
1616
qtkeychain-qt6-dev, libcurl4-openssl-dev,

Package/debian/control.ubuntu.26

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
1010
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
1111
qt6-scxml-dev, qt6-multimedia-dev, qt6-serialport-dev, qt6-websockets-dev,
1212
qt6-webengine-dev, qt6-webengine-dev-tools, qt6-positioning-dev, qt6-webchannel-dev,
13-
qt6-speech-dev,
13+
qt6-speech-dev, libqt6waylandclient6,
1414
libssl-dev, libcrypt-dev, libcmark-dev,
1515
freerdp3-dev, libvncserver-dev, libpcap-dev,
1616
qtkeychain-qt6-dev, libcurl4-openssl-dev,

Script/build_appimage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ echo_status "Build AppImage ......"
235235
# See: https://github.com/linuxdeploy/linuxdeploy-plugin-qt
236236
#export QMAKE=$QT_ROOT/bin/qmake6
237237
#export PATH=$QT_ROOT/libexec:$PATH
238-
export EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqvnc.so"
238+
export EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqvnc.so;libqwayland.so"
239239
#export DEPLOY_PLATFORM_THEMES=true
240240
# Icons from theme are not displayed in QtWidgets Application: https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/17
241241
# qtmodules: https://doc.qt.io/archives/qt-6.7/qtmodules.html

0 commit comments

Comments
 (0)