fixed mac stuff and added more debug code

This commit is contained in:
nuuls
2018-05-24 22:58:07 +02:00
committed by fourtf
parent 835b6d80da
commit 6ee4945715
7 changed files with 51 additions and 13 deletions
+8 -2
View File
@@ -115,10 +115,16 @@ FontManager::FontData FontManager::createFontData(Type type, float scale)
// normal Ui font (use pt size)
{
#ifdef Q_OS_MAC
constexpr float multiplier = 0.8f;
#else
constexpr float multiplier = 1.f;
#endif
static std::unordered_map<Type, UiFontData> defaultSize{
{Tiny, {8, "Monospace", false, QFont::Normal}},
{UiMedium, {12, DEFAULT_FONT_FAMILY, false, QFont::Normal}},
{UiTabs, {9, "Segoe UI", false, QFont::Normal}},
{UiMedium, {int(12 * multiplier), DEFAULT_FONT_FAMILY, false, QFont::Normal}},
{UiTabs, {int(9 * multiplier), DEFAULT_FONT_FAMILY, false, QFont::Normal}},
};
UiFontData &data = defaultSize[type];
+4 -3
View File
@@ -1,11 +1,12 @@
#pragma once
#include "widgets/window.hpp"
#include "widgets/splitcontainer.hpp"
namespace chatterino {
namespace widgets {
struct SplitContainer::Node;
}
//namespace widgets {
//struct SplitContainer::Node;
//}
namespace singletons {
class WindowManager