3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #99 from rtgoodwin/fix-windows-fonts

Browse source 
Fixed bolding and font issues on Windows
This commit is contained in:
Alessandro Ranellucci 2011-12-06 13:48:15 -08:00
commit 9f6be233f8
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/Slic3r/GUI/OptionsGroup.pm
View file

@ -2,10 +2,11 @@ package Slic3r::GUI::OptionsGroup;
use strict; use strict;
use warnings; use warnings;
use Wx qw(:sizer); use Wx qw(:sizer wxSYS_DEFAULT_GUI_FONT);
use Wx::Event qw(EVT_TEXT EVT_CHECKBOX EVT_CHOICE); use Wx::Event qw(EVT_TEXT EVT_CHECKBOX EVT_CHOICE);
use base 'Wx::StaticBoxSizer'; use base 'Wx::StaticBoxSizer';
# not very elegant, but this solution is temporary waiting for a better GUI # not very elegant, but this solution is temporary waiting for a better GUI
our @reload_callbacks = (); our @reload_callbacks = ();
@ -17,13 +18,19 @@ sub new {
my $self = $class->SUPER::new($box, wxVERTICAL); my $self = $class->SUPER::new($box, wxVERTICAL);
my $grid_sizer = Wx::FlexGridSizer->new(scalar(@{$p{options}}), 2, 2, 0); my $grid_sizer = Wx::FlexGridSizer->new(scalar(@{$p{options}}), 2, 2, 0);
my $bold_font = Wx::SystemSettings::GetFont(0);
#grab the default font, to fix Windows font issues/keep things consistent
my $bold_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
$bold_font->SetWeight(&Wx::wxFONTWEIGHT_BOLD); $bold_font->SetWeight(&Wx::wxFONTWEIGHT_BOLD);
foreach my $opt_key (@{$p{options}}) { foreach my $opt_key (@{$p{options}}) {
my $opt = $Slic3r::Config::Options->{$opt_key}; my $opt = $Slic3r::Config::Options->{$opt_key};
my $label = Wx::StaticText->new($parent, -1, "$opt->{label}:", Wx::wxDefaultPosition, [180,-1]); my $label = Wx::StaticText->new($parent, -1, "$opt->{label}:", Wx::wxDefaultPosition, [180,-1]);
$label->Wrap(180); # needed to avoid Linux/GTK bug $label->Wrap(180); # needed to avoid Linux/GTK bug
#set the bold font point size to the same size as all the other labels (for consistency)
$bold_font->SetPointSize($label->GetFont()->GetPointSize());
$label->SetFont($bold_font) if $opt->{important}; $label->SetFont($bold_font) if $opt->{important};
my $field; my $field;
if ($opt->{type} =~ /^(i|f|s)$/) { if ($opt->{type} =~ /^(i|f|s)$/) {