summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-08-28 09:18:40 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-08-28 09:20:05 (GMT)
commit66f820c2c7e2d7c6d883c995bf7b2da37aa963c7 (patch)
tree19b495dc2d215b84da103af0c7e62a196de6049a /Swift
parent6d74e548e9e748007f6541dbcb0ed148e572332e (diff)
downloadswift-contrib-66f820c2c7e2d7c6d883c995bf7b2da37aa963c7.zip
swift-contrib-66f820c2c7e2d7c6d883c995bf7b2da37aa963c7.tar.bz2
Disable the 'Decrease font size' menu item in chats when it's already minimal.
Resolves: #968
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtChatView.cpp1
-rw-r--r--Swift/QtUI/QtWebView.cpp9
-rw-r--r--Swift/QtUI/QtWebView.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index c533525..4c6a729 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -229,6 +229,7 @@ void QtChatView::resizeFont(int fontSizeSteps) {
foreach (QWebElement span, spans) {
span.setStyleProperty("font-size", sizeString);
}
+ webView_->setFontSizeIsMinimal(size == 1.0);
}
void QtChatView::resetView() {
diff --git a/Swift/QtUI/QtWebView.cpp b/Swift/QtUI/QtWebView.cpp
index 5d25071..5f9539e 100644
--- a/Swift/QtUI/QtWebView.cpp
+++ b/Swift/QtUI/QtWebView.cpp
@@ -39,6 +39,10 @@ void QtWebView::dragEnterEvent(QDragEnterEvent*) {
}
+void QtWebView::setFontSizeIsMinimal(bool minimum) {
+ fontSizeIsMinimal = minimum;
+}
+
void QtWebView::contextMenuEvent(QContextMenuEvent* ev) {
// Filter out the relevant actions from the standard actions
QMenu* menu = page()->createStandardContextMenu();
@@ -60,7 +64,10 @@ void QtWebView::contextMenuEvent(QContextMenuEvent* ev) {
// Add our own custom actions
menu->addAction(tr("Clear"), this, SIGNAL(clearRequested()));
menu->addAction(tr("Increase font size"), this, SIGNAL(fontGrowRequested()));
- menu->addAction(tr("Decrease font size"), this, SIGNAL(fontShrinkRequested()));
+ QAction* shrink = new QAction(tr("Decrease font size"), this);
+ shrink->setEnabled(!fontSizeIsMinimal);
+ connect(shrink, SIGNAL(triggered()), this, SIGNAL(fontShrinkRequested()));
+ menu->addAction(shrink);
menu->exec(ev->globalPos());
delete menu;
diff --git a/Swift/QtUI/QtWebView.h b/Swift/QtUI/QtWebView.h
index eb5a82d..202037f 100644
--- a/Swift/QtUI/QtWebView.h
+++ b/Swift/QtUI/QtWebView.h
@@ -18,6 +18,7 @@ namespace Swift {
void keyPressEvent(QKeyEvent* event);
void dragEnterEvent(QDragEnterEvent *event);
void contextMenuEvent(QContextMenuEvent* ev);
+ void setFontSizeIsMinimal(bool minimum);
signals:
void gotFocus();
@@ -30,5 +31,6 @@ namespace Swift {
private:
std::vector<QWebPage::WebAction> filteredActions;
+ bool fontSizeIsMinimal;
};
}