Superminaren/sample-hive
1
0
Fork 0
mirror of https://gitlab.com/samplehive/sample-hive.git synced 2026-10-23 13:15:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add experimental Windows build.

Browse Source
This commit is contained in:
apoorv569
2022-02-15 22:54:44 +05:30
parent db7a476a1d
commit b367a9d895
6 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GUI/Dialogs/Settings.cpp
+4 -3
View File
@@ -27,6 +27,7 @@
#include <wx/defs.h>
#include <wx/gdicmn.h>
#include <wx/stringimpl.h>
#include <wx/settings.h>
cSettings::cSettings(wxWindow *window)
: wxDialog(window, wxID_ANY, "cSettings", wxDefaultPosition,
@@ -364,7 +365,7 @@ void cSettings::OnChangeFontSize(wxSpinEvent& event)
int font_size = m_pFontSize->GetValue();
if (m_pFontType->GetStringSelection() == "System default")
m_Font = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
m_Font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
m_Font.SetPointSize(font_size);
@@ -381,7 +382,7 @@ void cSettings::LoadDefaultConfig()
{
SampleHive::cSerializer serializer;
wxFont sys_font = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
wxFont sys_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
wxString system_font = sys_font.GetFaceName();
int system_font_size = sys_font.GetPointSize();
@@ -450,7 +451,7 @@ void cSettings::SetCustomFont()
{
SampleHive::cSerializer serializer;
wxFont sys_font = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
wxFont sys_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
std::string system_font = sys_font.GetFaceName().ToStdString();
int system_font_size = sys_font.GetPointSize();
src/GUI/Resources.rc
+6
View File
@@ -0,0 +1,6 @@
#define wxUSE_RC_MANIFEST 1
#define wxUSE_DPI_AWARE_MANIFEST 2
#include <wx/msw/wx.rc>
ApplicationIcon ICON "../../assets/icons/icon-hive_32x32.ico"
src/Utility/Serialize.cpp
+2 -1
View File
@@ -27,6 +27,7 @@
#include <wx/colour.h>
#include <wx/filename.h>
#include <wx/settings.h>
#include <yaml-cpp/emittermanip.h>
#include <yaml-cpp/node/parse.h>
@@ -37,7 +38,7 @@ namespace SampleHive {
{
std::ifstream ifstrm(static_cast<std::string>(CONFIG_FILEPATH));
wxFont font = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
std::string system_font_face = font.GetFaceName().ToStdString();
int system_font_size = font.GetPointSize();