Ignore:
Timestamp:
Apr 6, 2021, 8:11:02 PM (3 years ago)
Author:
chronos
Message:
  • Modified: Merged trunk branch version r348 into highdpi branch.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/highdpi/Settings.pas

    r303 r349  
    2828  TSettingsDlg = class(TDrawDlg)
    2929    ButtonFullscreen: TButtonC;
     30    Down2Btn: TButtonC;
    3031    List: TDpiListBox;
    3132    OKBtn: TButtonA;
    3233    CancelBtn: TButtonA;
     34    Up2Btn: TButtonC;
    3335    procedure ButtonFullscreenClick(Sender: TObject);
    3436    procedure CancelBtnClick(Sender: TObject);
     37    procedure Down2BtnClick(Sender: TObject);
    3538    procedure FormCreate(Sender: TObject);
    3639    procedure FormDestroy(Sender: TObject);
     
    3841    procedure FormShow(Sender: TObject);
    3942    procedure OKBtnClick(Sender: TObject);
     43    procedure Up2BtnClick(Sender: TObject);
    4044  private
    41     { private declarations }
     45    LocalGamma: Integer;
    4246  public
    4347    Languages: TLanguages;
     
    103107  OKBtn.Caption := Phrases.Lookup('BTN_OK');
    104108  CancelBtn.Caption := Phrases.Lookup('BTN_CANCEL');
    105   OkBtn.Graphic := GrExt[HGrSystem].Data;
    106   CancelBtn.Graphic := GrExt[HGrSystem].Data;
    107 
    108   ButtonFullscreen.Graphic := GrExt[HGrSystem].Data;
     109  InitButtons;
    109110end;
    110111
     
    112113begin
    113114  ModalResult := mrCancel;
     115end;
     116
     117procedure TSettingsDlg.Down2BtnClick(Sender: TObject);
     118begin
     119  if LocalGamma > 50 then
     120  begin
     121    Dec(LocalGamma);
     122    Invalidate;
     123  end;
    114124end;
    115125
     
    142152    MainTexture.clBevelLight);
    143153
    144   s := Phrases.Lookup('SETTINGS', 0);
     154  S := Phrases.Lookup('SETTINGS', 0);
    145155  LoweredTextOut(Canvas, -2, MainTexture, ButtonFullscreen.Left + 32,
    146     ButtonFullscreen.Top - 4, s);
     156    ButtonFullscreen.Top - 4, S);
     157
     158  // Gamma
     159  UnderlinedTitleValue(Canvas, Phrases.Lookup('SETTINGS', 1), IntToStr(LocalGamma) + '%',
     160    Up2Btn.Left - 150 - 4, Up2Btn.Top + 2, 150);
    147161end;
    148162
     
    158172  SaveData;
    159173  ModalResult := mrOk;
     174end;
     175
     176procedure TSettingsDlg.Up2BtnClick(Sender: TObject);
     177begin
     178  if LocalGamma < 150 then begin
     179    Inc(LocalGamma);
     180    Invalidate;
     181  end;
    160182end;
    161183
     
    167189  if FullScreen then ButtonFullscreen.ButtonIndex := 3
    168190    else ButtonFullscreen.ButtonIndex := 2;
     191  LocalGamma := Gamma;
    169192end;
    170193
    171194procedure TSettingsDlg.SaveData;
    172 begin
     195var
     196  NeedRestart: Boolean;
     197begin
     198  NeedRestart := Gamma <> LocalGamma;
    173199  LocaleCode := Languages[List.ItemIndex].ShortName;
    174200  FullScreen := (ButtonFullscreen.ButtonIndex and 1) = 1;
     201  Gamma := LocalGamma;
     202  if NeedRestart then SimpleMessage(Phrases.Lookup('SETTINGS', 2));
    175203end;
    176204
Note: See TracChangeset for help on using the changeset viewer.