luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some fixes in the welcome dialog.

Browse source 
[DEVELOPMENT ENVIRONMENT]
* NEW: Welcome dialog: Allow it to be smaller.
* BUG: Welcome dialog: Correctly draw project boxes in small mode.
* NEW: Version control: Make branch colors darker.
This commit is contained in:
gambas 2022-02-25 03:10:44 +01:00
parent afbf32aa8e
commit ff2d1f6e5b
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/gambas3/.src/FMain.class
View file

@ -2634,11 +2634,13 @@ End
Public Sub Form_Resize()
Dim W, H As Integer
Dim DS As Integer
If dwgWelcome.Visible Then
W = Desktop.Scale * 106 + 64
If W > Me.ClientW Then W = Max(Me.ClientW, Desktop.Scale * 80 + 64)
H = Max(Desktop.Scale * 90 + 64, Me.ClientH - 64)
DS = Desktop.Scale
W = DS * 113 + 1
If W > Me.ClientW Then W = Max(Me.ClientW, DS * 70)
H = Max(DS * 60, Me.ClientH)
dwgWelcome.Move((Me.ClientW - W) \ 2, (Me.ClientH - H) \ 2, W, H)
Endif

13
app/src/gambas3/.src/Project/ProjectBox.class
View file

@ -264,12 +264,13 @@ Public Sub DrawingArea_Draw()
hExt = Paint.TextExtents(sText)
HT = Paint.Font.Height
Paint.DrawText(sText, X + WT, Y, Paint.W, Paint.H, Align.TopLeft)
WT += Paint.Font.TextWidth(sText)
If .Branch Then
XB = X + hExt.Width + P
YB = Y - 2
HB = Ceil(hExt.H) + 4
XB = X + WT + P
YB = Y
HB = HT
GoSub DRAW_BRANCH
@ -292,13 +293,13 @@ Public Sub DrawingArea_Draw()
sText = .Version
hExt = Paint.TextExtents(sText)
HT = Paint.Font.H
Paint.DrawText(sText, X, Y + HT, Paint.W, hExt.H, Align.Left)
Paint.DrawText(sText, X, Y + HT, Paint.W, HT, Align.Left)
If .Branch Then
XB = X + hExt.Width + P
YB = Y + HT - 2
HB = Ceil(hExt.H) + 4
YB = Y + HT
HB = HT 'Ceil(hExt.H) + 4
GoSub DRAW_BRANCH

2
app/src/gambas3/.src/VersionControl/VersionControl.module
View file

@ -34,7 +34,7 @@ Private $bCancel As Boolean
Private $sCurrentBranch As String
Private $cBranchColor As New Collection
Private $aBranchColor As Integer[] = [&HFF0000, &HFF007F, &HFF00FF, &H7F00FF, &H0000FF, &H007FFF, &H00E0E0, &H00E000, &HE0E000, &HFFBF00, &HFF7F00, &HC00000, &HC00060, &HC000C0, &H00A0A0, &H00A000, &HA0A000, &HC09000, &HC05C00]
Private $aBranchColor As Integer[] = [&HE00000, &HE00070, &HE000E0, &H6C00E0, &H0000E0, &H0060C0, &H00C0C0, &H00C000, &HC0C000, &HE0A400, &HC05C00, &HA00000, &HA00050, &HA000A0, &H008080, &H008000, &H808000, &HA07800, &HA04A00]
Private Const DEFAULT_BRANCH_COLOR As Integer = &H606060

8
app/src/gambas3/.src/Welcome/FWelcome.class
View file

@ -434,7 +434,7 @@ Public Sub panList_Arrange()
Dim iArr As Integer
iArr = If(panList.W > Desktop.Scale * 70, Arrange.Row, Arrange.Vertical)
iArr = If(panList.W >= Desktop.Scale * 70, Arrange.Row, Arrange.Vertical)
'Debug iArr;; panList.W;; Desktop.Scale * 64
$hRecent.SetArrangement(iArr)
$hExample.SetArrangement(iArr)
@ -460,3 +460,9 @@ Public Sub MediaPlayer_End()
End
Public Sub Form_Arrange()
End