Skip to content

Issue 325 : Search Box Positioning #591

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
merged 8 commits into from
Jul 5, 2024
Merged

Issue 325 : Search Box Positioning #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3db07b9
Issue 325 : Search Box Positioning
pydavem Jul 3, 2024
442c182
Undo whitespace changes
dail8859 Jul 4, 2024
169bb95
Use parentWidget() instead of storing parent window
dail8859 Jul 4, 2024
78ef210
Cleanup logic to center dialog
dail8859 Jul 4, 2024
d83d315
Rename variable
dail8859 Jul 4, 2024
3a48f52
Flip if() logic
dail8859 Jul 4, 2024
be61355
Use correct signal for notification
dail8859 Jul 4, 2024
b462d9d
Rename checkbox and change button text
dail8859 Jul 4, 2024
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
1 change: 1 addition & 0 deletions src/NotepadNext/ApplicationSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ CREATE_SETTING(Gui, ShowMenuBar, showMenuBar, bool, true)
CREATE_SETTING(Gui, ShowToolBar, showToolBar, bool, true)
CREATE_SETTING(Gui, ShowTabBar, showTabBar, bool, true)
CREATE_SETTING(Gui, ShowStatusBar, showStatusBar, bool, true)
CREATE_SETTING(Gui, CenterSearchDialog, centerSearchDialog, bool, true)

CREATE_SETTING(Gui, TabsClosable, tabsClosable, bool, true)
CREATE_SETTING(Gui, ExitOnLastTabClosed, exitOnLastTabClosed, bool, false)
Expand Down
1 change: 1 addition & 0 deletions src/NotepadNext/ApplicationSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class ApplicationSettings : public QSettings
DEFINE_SETTING(ShowToolBar, showToolBar, bool)
DEFINE_SETTING(ShowTabBar, showTabBar, bool)
DEFINE_SETTING(ShowStatusBar, showStatusBar, bool)
DEFINE_SETTING(CenterSearchDialog, centerSearchDialog, bool)

DEFINE_SETTING(TabsClosable, tabsClosable, bool)
DEFINE_SETTING(ExitOnLastTabClosed, exitOnLastTabClosed, bool)
Expand Down
18 changes: 13 additions & 5 deletions src/NotepadNext/dialogs/FindReplaceDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ FindReplaceDialog::FindReplaceDialog(ISearchResultsHandler *searchResults, MainW

// Turn off the help button on the dialog
setWindowFlag(Qt::WindowContextHelpButtonHint, false);

ui->setupUi(this);

// Get the current editor, and keep up the reference
Expand Down Expand Up @@ -151,6 +150,7 @@ FindReplaceDialog::FindReplaceDialog(ISearchResultsHandler *searchResults, MainW
connect(qApp, &QApplication::aboutToQuit, this, &FindReplaceDialog::saveSettings);

changeTab(tabBar->currentIndex());

}

FindReplaceDialog::~FindReplaceDialog()
Expand Down Expand Up @@ -367,8 +367,8 @@ void FindReplaceDialog::transparencyToggled(bool on)

if (on) {
if (ui->radioOnLosingFocus->isChecked()) {
adjustOpacityWhenLosingFocus(true);
adjustOpacityAlways(false);
adjustOpacityWhenLosingFocus(true);
adjustOpacityAlways(false);
}
else {
adjustOpacityWhenLosingFocus(false);
Expand Down Expand Up @@ -576,14 +576,22 @@ void FindReplaceDialog::savePosition()
{
qInfo(Q_FUNC_INFO);

position = pos();
lastClosedPosition = pos();
}

void FindReplaceDialog::restorePosition()
{
qInfo(Q_FUNC_INFO);

move(position);
ApplicationSettings settings;

if (settings.centerSearchDialog()) {
const QPoint centerPoint = parentWidget()->geometry().center();
move(centerPoint - rect().center());
}
else {
move(lastClosedPosition);
}
}

int FindReplaceDialog::computeSearchFlags()
Expand Down
3 changes: 1 addition & 2 deletions src/NotepadNext/dialogs/FindReplaceDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,12 @@ private slots:
void updateReplaceList(const QString &text);

bool isFirstTime = true;
QPoint position;
QPoint lastClosedPosition;
Ui::FindReplaceDialog *ui;

ScintillaNext *editor;
QStatusBar *statusBar;
QTabBar *tabBar;

ISearchResultsHandler *searchResultsHandler;
Finder *finder;
};
Expand Down
1 change: 1 addition & 0 deletions src/NotepadNext/dialogs/PreferencesDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ PreferencesDialog::PreferencesDialog(ApplicationSettings *settings, QWidget *par
MapSettingToCheckBox(ui->checkBoxMenuBar, &ApplicationSettings::showMenuBar, &ApplicationSettings::setShowMenuBar, &ApplicationSettings::showMenuBarChanged);
MapSettingToCheckBox(ui->checkBoxToolBar, &ApplicationSettings::showToolBar, &ApplicationSettings::setShowToolBar, &ApplicationSettings::showToolBarChanged);
MapSettingToCheckBox(ui->checkBoxStatusBar, &ApplicationSettings::showStatusBar, &ApplicationSettings::setShowStatusBar, &ApplicationSettings::showStatusBarChanged);
MapSettingToCheckBox(ui->checkBoxRecenterSearchDialog, &ApplicationSettings::centerSearchDialog, &ApplicationSettings::setCenterSearchDialog, &ApplicationSettings::centerSearchDialogChanged);

MapSettingToGroupBox(ui->gbxRestorePreviousSession, &ApplicationSettings::restorePreviousSession, &ApplicationSettings::setRestorePreviousSession, &ApplicationSettings::restorePreviousSessionChanged);
connect(ui->gbxRestorePreviousSession, &QGroupBox::toggled, this, [=](bool checked) {
Expand Down
9 changes: 8 additions & 1 deletion src/NotepadNext/dialogs/PreferencesDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>838</width>
<height>450</height>
<height>469</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -68,6 +68,13 @@
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="checkBoxRecenterSearchDialog">
<property name="text">
<string>Recenter find/replace dialog when opened</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxCombineSearchResults">
<property name="text">
Expand Down