From 161249981779adf608dbeb84c1866c57e52ea1ed Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 19 May 2025 18:00:28 -0700 Subject: [PATCH] Add URL toolbar spacers. https://redmine.stoutner.com/issues/1249 --- src/windows/BrowserWindow.cpp | 15 +++++++++++++++ src/windows/BrowserWindow.h | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp index c92c613..dcc884d 100644 --- a/src/windows/BrowserWindow.cpp +++ b/src/windows/BrowserWindow.cpp @@ -521,10 +521,23 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer) // Set the default label text. findTextLabelPointer->setText(QLatin1String(" ") + i18nc("Default find results.", "0/0") + QLatin1String(" ")); + // Create the spacer widgets. + QWidget *blockedRequestsInitialSpacerWidgetPointer = new QWidget(); + QWidget *blockedRequestsFinalSpacerWidgetPointer = new QWidget(); + QWidget *findTextSpacerWidgetPointer = new QWidget(); + + // Set the widths for the spacer widgets. + blockedRequestsInitialSpacerWidgetPointer->setFixedSize(3, 0); + blockedRequestsFinalSpacerWidgetPointer->setFixedSize(2, 0); + findTextSpacerWidgetPointer->setFixedSize(2, 0); + // Insert the widgets into the toolbars. urlToolBarPointer->insertWidget(blockedRequestsActionPointer, urlLineEditPointer); + urlToolBarPointer->insertWidget(blockedRequestsActionPointer, blockedRequestsInitialSpacerWidgetPointer); + urlToolBarPointer->insertWidget(javaScriptActionPointer, blockedRequestsFinalSpacerWidgetPointer); findTextLineEditActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLineEditPointer); findTextLabelActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLabelPointer); + findTextSpacerActionPointer = urlToolBarPointer->insertWidget(findTextLineEditActionPointer, findTextSpacerWidgetPointer); // Initially hide the find text actions. hideFindTextActions(); @@ -1106,6 +1119,7 @@ void BrowserWindow::getZoomFactorFromUser() void BrowserWindow::hideFindTextActions() const { // Hide the find text actions. + findTextSpacerActionPointer->setVisible(false); findTextLineEditActionPointer->setVisible(false); findTextLabelActionPointer->setVisible(false); findNextActionPointer->setVisible(false); @@ -1642,6 +1656,7 @@ void BrowserWindow::showFilterListsDialog() void BrowserWindow::showFindTextActions() const { // Show the find text actions. + findTextSpacerActionPointer->setVisible(true); findTextLineEditActionPointer->setVisible(true); findTextLabelActionPointer->setVisible(true); findNextActionPointer->setVisible(true); diff --git a/src/windows/BrowserWindow.h b/src/windows/BrowserWindow.h index 4b8cc0b..525cb85 100644 --- a/src/windows/BrowserWindow.h +++ b/src/windows/BrowserWindow.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2022-2024 Soren Stoutner + * SPDX-FileCopyrightText: 2022-2025 Soren Stoutner * * This file is part of Privacy Browser PC . * @@ -153,6 +153,7 @@ private: QLabel *findTextLabelPointer; QAction *findTextLineEditActionPointer; KLineEdit *findTextLineEditPointer; + QAction *findTextSpacerActionPointer; KToggleFullScreenAction *fullScreenActionPointer; QAction *hideFindTextActionPointer; QAction *javaScriptActionPointer; -- 2.47.2