Swiftdiff options
| author | Thanos Doukoudakis <thanos.doukoudakis@isode.com> | 2017-05-03 12:28:44 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-05-03 15:59:31 (GMT) |
| commit | 34f1bbf1fad2eecd7f9844f76f1bc073cc34a581 (patch) | |
| tree | b503585a6fa75cf3c16430838c3e3d33e23009a7 /Swift/QtUI | |
| parent | 29e2c0fbdd0a27b64c199454c32fc746230f7d98 (diff) | |
| download | swift-34f1bbf1fad2eecd7f9844f76f1bc073cc34a581.zip swift-34f1bbf1fad2eecd7f9844f76f1bc073cc34a581.tar.bz2 | |
Change the default font size in chat view
This will make the default font size in chat view to match the one in
roster.
This fix also decreases the font scaling step to half, and lowers the
minimum font scale.
Test-Information:
Tested and verified the changes to Windows with Qt5.7.
Change-Id: If5873049af4e82fba871e5d2687575aa88b533c9
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtUISettingConstants.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/QtUISettingConstants.cpp b/Swift/QtUI/QtUISettingConstants.cpp index 2b8edc2..b4b9780 100644 --- a/Swift/QtUI/QtUISettingConstants.cpp +++ b/Swift/QtUI/QtUISettingConstants.cpp @@ -14,7 +14,7 @@ const SettingsProvider::Setting<bool> QtUISettingConstants::COMPACT_ROSTER("comp const SettingsProvider::Setting<std::string> QtUISettingConstants::CLICKTHROUGH_BANNER("clickthroughBanner", ""); const SettingsProvider::Setting<int> QtUISettingConstants::CURRENT_ROSTER_TAB("currentRosterTab", 0); const SettingsProvider::Setting<bool> QtUISettingConstants::SHOW_NICK_IN_ROSTER_HEADER("showNickInRosterHeader", true); -const SettingsProvider::Setting<int> QtUISettingConstants::CHATWINDOW_FONT_SIZE("chatWindowFontSize_V2", 2); +const SettingsProvider::Setting<int> QtUISettingConstants::CHATWINDOW_FONT_SIZE("chatWindowFontSize_V2", 3); const SettingsProvider::Setting<int> QtUISettingConstants::HISTORYWINDOW_FONT_SIZE("historyWindowFontSize", 0); const SettingsProvider::Setting<bool> QtUISettingConstants::SHOW_EMOTICONS("showEmoticons", true); const SettingsProvider::Setting<bool> QtUISettingConstants::USE_PLAIN_CHATS("plainChats", false); diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp index bca80f3..ea9a9c6 100644 --- a/Swift/QtUI/QtWebKitChatView.cpp +++ b/Swift/QtUI/QtWebKitChatView.cpp @@ -53,7 +53,7 @@ const QString QtWebKitChatView::ButtonFileTransferOpenFile = QString("filetransf const QString QtWebKitChatView::ButtonMUCInvite = QString("mucinvite"); namespace { - const double minimalFontScaling = 0.8; + const double minimalFontScaling = 0.7; } QtWebKitChatView::QtWebKitChatView(QtChatWindow* window, UIEventStream* eventStream, QtChatTheme* theme, QWidget* parent, bool disableAutoScroll) : QtChatView(parent), window_(window), eventStream_(eventStream), fontSizeSteps_(0), disableAutoScroll_(disableAutoScroll), previousMessageKind_(PreviosuMessageWasNone), previousMessageWasSelf_(false), showEmoticons_(false), insertingLastLine_(false), idCounter_(0) { @@ -309,7 +309,7 @@ void QtWebKitChatView::decreaseFontSize() { void QtWebKitChatView::resizeFont(int fontSizeSteps) { fontSizeSteps_ = fontSizeSteps; - double size = minimalFontScaling + 0.2 * fontSizeSteps_; + double size = minimalFontScaling + 0.1 * fontSizeSteps_; QString sizeString(QString().setNum(size, 'g', 3) + "em"); // Set the font size in the <style id="text-resize-style"> element in the theme <head> element. |