From a4c2c8924d45a8e9ccc01d7ab1e30d071850a432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 9 Nov 2005 20:03:27 +0000 Subject: [PATCH] * No longer updates anything in SetDefaults() if the default font is the same as the current font. * Don't allow reverting after "Defaults" if there were no changes. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14806 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/fonts/FontSelectionView.cpp | 3 ++- src/preferences/fonts/MainWindow.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/preferences/fonts/FontSelectionView.cpp b/src/preferences/fonts/FontSelectionView.cpp index 38197dfc6e..4285c74f67 100644 --- a/src/preferences/fonts/FontSelectionView.cpp +++ b/src/preferences/fonts/FontSelectionView.cpp @@ -346,7 +346,8 @@ FontSelectionView::SetDefaults() defaultFont.SetFamilyAndStyle(family, style); defaultFont.SetSize(size); - defaultFont.GetFamilyAndStyle(&family, &style); + if (defaultFont == fCurrentFont) + return; _SelectCurrentFont(false); diff --git a/src/preferences/fonts/MainWindow.cpp b/src/preferences/fonts/MainWindow.cpp index 14193b1ec3..fa866a5655 100644 --- a/src/preferences/fonts/MainWindow.cpp +++ b/src/preferences/fonts/MainWindow.cpp @@ -116,7 +116,7 @@ MainWindow::MessageReceived(BMessage *message) case kMsgSetDefaults: fFontsView->SetDefaults(); - fRevertButton->SetEnabled(true); + fRevertButton->SetEnabled(fFontsView->IsRevertable()); break; case kMsgRevert: