-
Notifications
You must be signed in to change notification settings - Fork 524
Added setting to horizontally offset start button #2524
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -498,8 +498,8 @@ class CStartMenuTarget: public IDropTarget | |
| return E_NOINTERFACE; | ||
| } | ||
|
|
||
| virtual ULONG STDMETHODCALLTYPE AddRef( void ) | ||
| { | ||
| virtual ULONG STDMETHODCALLTYPE AddRef( void ) | ||
| { | ||
| return InterlockedIncrement(&m_RefCount); | ||
| } | ||
|
|
||
|
|
@@ -1345,8 +1345,13 @@ static void UpdateStartButtonPosition(const TaskbarInfo* taskBar, const WINDOWPO | |
|
|
||
| // Start button on Win11 is a bit shifted to the right | ||
| // We will shift our Aero button to cover original button | ||
| if (IsWin11() && (x == info.rcMonitor.left) && (GetStartButtonType() == START_BUTTON_AERO) && !g_epTaskbar) | ||
| x += ScaleForDpi(taskBar->taskBar, 6); | ||
| if (IsWin11() && (x == info.rcMonitor.left) && !g_epTaskbar) { | ||
| if (GetStartButtonType() == START_BUTTON_AERO) | ||
| x += ScaleForDpi(taskBar->taskBar, 6); | ||
| // we should also be able to shift our custom icon, as it's also incorrectly aligned to the left edge on Windows 11 | ||
| else if (GetStartButtonType() == START_BUTTON_CUSTOM) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note that this code is restricted only for Win11 without ExplorerPatcher. I'd move this outside of the |
||
| x += ScaleForDpi(taskBar->taskBar, GetSettingInt(L"StartButtonOffset")); | ||
| } | ||
| } | ||
|
|
||
| RECT rcButton = { x, y, x + taskBar->startButtonSize.cx, y + taskBar->startButtonSize.cy }; | ||
|
|
@@ -2389,7 +2394,7 @@ void UpdateTaskBars( TUpdateTaskbar update ) | |
| { | ||
| if (bDefColor && GetWinVersion()>WIN_VER_WIN7) | ||
| { | ||
| if (IsAppThemed()) | ||
| if (IsAppThemed()) | ||
| { | ||
| color=GetSystemGlassColor8(); | ||
| color=((color&0xFF)<<16)|(color&0xFF00)|((color>>16)&0xFF); | ||
|
|
@@ -4306,7 +4311,7 @@ HBITMAP GetStartScreenIcon( int size ) | |
| } | ||
| SelectObject(hDst,bmp0); | ||
| DeleteDC(hDst); | ||
|
|
||
| int i=0; | ||
| int n=size*rc.top; | ||
| for (;i<n;i++) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1073,6 +1073,8 @@ BEGIN | |
| IDS_MENU_GLASS "Enable Aero Glass (requires Aero Glass mod)" | ||
| IDS_MENU_GLASS_TIP "Check this to use glass transparency (requires the Aero Glass mod to be installed)" | ||
| IDS_MAIN_MENU_SETTINGS "Main Menu" | ||
| IDS_BUTTON_OFFSET "Button left offset" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd name it just |
||
| IDS_BUTTON_OFFSET_TIP "Offset the start button horizontally by the amount of pixels specified" | ||
| END | ||
|
|
||
| STRINGTABLE | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you remove these unintentional whitespace changes? They are not related to changes in this PR.
There are some more below.