Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdottaka
sdottaka committed Oct 19, 2024
1 parent a50fc4c commit 4981501
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 52 deletions.
37 changes: 12 additions & 25 deletions ColorSchemes/Midnight.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Settings/MovedBlockTextColor=0xffffffff
Settings/SNPColor=0x40210a
Settings/SNPDeletedColor=0x251305
Settings/SNPTextColor=0xffffffff
Settings/SelectedDifferenceColor=0x2b2233
Settings/SelectedDifferenceColor=0x2b2255
Settings/SelectedDifferenceDeletedColor=0x1b1223
Settings/SelectedDifferenceTextColor=0xffffffff
Settings/SelectedMovedBlockColor=0x423607
Expand All @@ -159,34 +159,21 @@ Settings/WordDifferenceDeletedColor=0xde000d
Settings/WordDifferenceTextColor=0xffffffff
Settings/SysColorHookEnabled=1
; System Colors
;0 0x2b2b2b COLOR_SCROLLBAR
;1 0x1e1e1e COLOR_DESKTOP
;2 0x1e1e1e COLOR_ACTIVECAPTION
;3 0x3c3c3c COLOR_INACTIVECAPTION
;4 0x2b2b2b COLOR_MENU
;5 0x1e1e1e COLOR_WINDOW
;6 0x2d2d2d COLOR_WINDOWFRAME
;7 0xe0e0e0 COLOR_MENUTEXT
;8 0xe0e0e0 COLOR_WINDOWTEXT
;9 0xe0e0e0 COLOR_CAPTIONTEXT
;10 0x1e1e1e COLOR_ACTIVEBORDER
;11 0x3c3c3c COLOR_INACTIVEBORDER
;2 0x005555 COLOR_ACTIVECAPTION
;3 0x003322 COLOR_INACTIVECAPTION
;5 0x111111 COLOR_WINDOW
;8 0xe0e2e0 COLOR_WINDOWTEXT
;9 0xe0e0e3 COLOR_CAPTIONTEXT
;12 0x1e1e1e COLOR_APPWORKSPACE
;13 0x007acc COLOR_HIGHLIGHT
;14 0xf1f1f1 COLOR_HIGHLIGHTTEXT
;15 0x2d2d2d COLOR_3DFACE
;16 0x3c3c3c COLOR_3DSHADOW
;15 0x222222 COLOR_3DFACE
;16 0x161616 COLOR_3DSHADOW
;17 0x555555 COLOR_GRAYTEXT
;18 0xe0e0e0 COLOR_BTNTEXT
;19 0xe0e0e0 COLOR_INACTIVECAPTIONTEXT
;20 0x4d4d4d COLOR_3DHIGHLIGHT
;18 0xe4e0e0 COLOR_BTNTEXT
;19 0xe0e5e0 COLOR_INACTIVECAPTIONTEXT
;20 0x333333 COLOR_3DHIGHLIGHT
;21 0x1e1e1e COLOR_3DDKSHADOW
;22 0x393939 COLOR_3DLIGHT
;23 0xe0e0e0 COLOR_INFOTEXT
;24 0x2d2d2d COLOR_INFOBK
;26 0x1f78d1 COLOR_HOTLIGHT
;27 0x2a2a2a COLOR_GRADIENTACTIVECAPTION
;28 0x333333 COLOR_GRADIENTINACTIVECAPTION
;29 0x007acc COLOR_MENUHILIGHT
;30 0x2b2b2b COLOR_MENUBAR
Settings/SysColorHookColors=0:0x002b2b2b,1:0x001e1e1e,2:0x001e1e1e,3:0x003c3c3c,4:0x002b2b2b,5:0x001e1e1e,6:0x002d2d2d,7:0x00e0e0e0,8:0x00e0e0e0,9:0x00e0e0e0,10:0x001e1e1e,11:0x003c3c3c,12:0x001e1e1e,13:0x00007acc,14:0x00f1f1f1,15:0x002d2d2d,16:0x003c3c3c,17:0x00555555,18:0x00e0e0e0,19:0x00e0e0e0,20:0x004d4d4d,21:0x001e1e1e,22:0x00393939,23:0x00e0e0e0,24:0x002d2d2d,26:0x001f78d1,27:0x002a2a2a,28:0x00333333,29:0x00007acc,30:0x002b2b2b
Settings/SysColorHookColors=2:0x00005555,3:0x00003322,5:0x001e1e1e,8:0x00e2e0e0,9:0x00e3e0e0,12:0x001e1e1e,13:0x00007acc,14:0x00f1f1f1,15:0x00222222,16:0x00161616,17:0x00555555,18:0x00e4e0e0,19:0x00e5e0e0,20:0x00333333,21:0x001e1e1e,27:0x002a2a2a,28:0x00333333
37 changes: 12 additions & 25 deletions ColorSchemes/Solarized Dark.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Settings/MovedBlockTextColor=0xffffffff
Settings/SNPColor=0x40210a
Settings/SNPDeletedColor=0x251305
Settings/SNPTextColor=0xffffffff
Settings/SelectedDifferenceColor=0x2b2233
Settings/SelectedDifferenceColor=0x2b2255
Settings/SelectedDifferenceDeletedColor=0x1b1223
Settings/SelectedDifferenceTextColor=0xffffffff
Settings/SelectedMovedBlockColor=0x423607
Expand All @@ -159,34 +159,21 @@ Settings/WordDifferenceDeletedColor=0x416036
Settings/WordDifferenceTextColor=0xffffffff
Settings/SysColorHookEnabled=1
; System Colors
;0 0x2b2b2b COLOR_SCROLLBAR
;1 0x1e1e1e COLOR_DESKTOP
;2 0x1e1e1e COLOR_ACTIVECAPTION
;3 0x3c3c3c COLOR_INACTIVECAPTION
;4 0x2b2b2b COLOR_MENU
;5 0x1e1e1e COLOR_WINDOW
;6 0x2d2d2d COLOR_WINDOWFRAME
;7 0xe0e0e0 COLOR_MENUTEXT
;8 0xe0e0e0 COLOR_WINDOWTEXT
;9 0xe0e0e0 COLOR_CAPTIONTEXT
;10 0x1e1e1e COLOR_ACTIVEBORDER
;11 0x3c3c3c COLOR_INACTIVEBORDER
;2 0x005555 COLOR_ACTIVECAPTION
;3 0x003322 COLOR_INACTIVECAPTION
;5 0x111111 COLOR_WINDOW
;8 0xe0e2e0 COLOR_WINDOWTEXT
;9 0xe0e0e3 COLOR_CAPTIONTEXT
;12 0x1e1e1e COLOR_APPWORKSPACE
;13 0x007acc COLOR_HIGHLIGHT
;14 0xf1f1f1 COLOR_HIGHLIGHTTEXT
;15 0x2d2d2d COLOR_3DFACE
;16 0x3c3c3c COLOR_3DSHADOW
;15 0x222222 COLOR_3DFACE
;16 0x161616 COLOR_3DSHADOW
;17 0x555555 COLOR_GRAYTEXT
;18 0xe0e0e0 COLOR_BTNTEXT
;19 0xe0e0e0 COLOR_INACTIVECAPTIONTEXT
;20 0x4d4d4d COLOR_3DHIGHLIGHT
;18 0xe4e0e0 COLOR_BTNTEXT
;19 0xe0e5e0 COLOR_INACTIVECAPTIONTEXT
;20 0x333333 COLOR_3DHIGHLIGHT
;21 0x1e1e1e COLOR_3DDKSHADOW
;22 0x393939 COLOR_3DLIGHT
;23 0xe0e0e0 COLOR_INFOTEXT
;24 0x2d2d2d COLOR_INFOBK
;26 0x1f78d1 COLOR_HOTLIGHT
;27 0x2a2a2a COLOR_GRADIENTACTIVECAPTION
;28 0x333333 COLOR_GRADIENTINACTIVECAPTION
;29 0x007acc COLOR_MENUHILIGHT
;30 0x2b2b2b COLOR_MENUBAR
Settings/SysColorHookColors=0:0x002b2b2b,1:0x001e1e1e,2:0x001e1e1e,3:0x003c3c3c,4:0x002b2b2b,5:0x001e1e1e,6:0x002d2d2d,7:0x00e0e0e0,8:0x00e0e0e0,9:0x00e0e0e0,10:0x001e1e1e,11:0x003c3c3c,12:0x001e1e1e,13:0x00007acc,14:0x00f1f1f1,15:0x002d2d2d,16:0x003c3c3c,17:0x00555555,18:0x00e0e0e0,19:0x00e0e0e0,20:0x004d4d4d,21:0x001e1e1e,22:0x00393939,23:0x00e0e0e0,24:0x002d2d2d,26:0x001f78d1,27:0x002a2a2a,28:0x00333333,29:0x00007acc,30:0x002b2b2b
Settings/SysColorHookColors=2:0x00005555,3:0x00003322,5:0x001e1e1e,8:0x00e2e0e0,9:0x00e3e0e0,12:0x001e1e1e,13:0x00007acc,14:0x00f1f1f1,15:0x00222222,16:0x00161616,17:0x00555555,18:0x00e4e0e0,19:0x00e5e0e0,20:0x00333333,21:0x001e1e1e,27:0x002a2a2a,28:0x00333333
2 changes: 2 additions & 0 deletions Src/FilepathEdit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,12 @@ void CFilepathEdit::OnPaint()
{
CClientDC dc(this);
CFont *pFontOld = dc.SelectObject(GetFont());
int oldTextColor = dc.SetTextColor(m_crText);
int oldBkMode = dc.SetBkMode(TRANSPARENT);
CRect rc = GetMenuCharRect(&dc);
dc.TextOutW(rc.left, 0, IsWin7_OrGreater() ? _T("\u2261") : _T("="));
dc.SetBkMode(oldBkMode);
dc.SetTextColor(oldTextColor);
dc.SelectObject(pFontOld);
}
}
Expand Down
4 changes: 2 additions & 2 deletions Src/PropSysColors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ BOOL PropSysColors::OnInitDialog()
{ _T("COLOR_INACTIVECAPTIONTEXT"), L"19" },
{ _T("COLOR_3DHIGHLIGHT"), L"20" },
{ _T("COLOR_3DDKSHADOW"), L"21" },
{ _T("COLOR_3DLIGHT"), L"22" },
// { _T("COLOR_3DLIGHT"), L"22" },
// { _T("COLOR_INFOTEXT"), L"23" },
// { _T("COLOR_INFOBK"), L"24" },
{ _T("COLOR_HOTLIGHT"), L"26" },
// { _T("COLOR_HOTLIGHT"), L"26" },
{ _T("COLOR_GRADIENTACTIVECAPTION"), L"27" },
{ _T("COLOR_GRADIENTINACTIVECAPTION"),L"28" },
// { _T("COLOR_MENUHILIGHT"), L"29" },
Expand Down

0 comments on commit 4981501

Please sign in to comment.