Skip to content

Add modern scrollbars #1013

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.

Sign up for GitHub

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

Merged
sabrogden merged 5 commits into from
Dec 7, 2025
Merged

Add modern scrollbars #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
322b522
Add option to prevent hiding window on focus lost
schmurtzm Dec 5, 2025
21de3d6
Add option to hide taskbar icon when window closes
schmurtzm Dec 5, 2025
1697bb4
Add theme preview to options dialog
schmurtzm Dec 5, 2025
400cc1a
Improve theme preview and refresh logic
schmurtzm Dec 6, 2025
118e710
Add modern scrollbars with theme support
schmurtzm Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CP_Main.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,11 +813,11 @@ BEGIN
CONTROL "Elevated privileges to paste into elevated apps",IDC_CHECK_ELEVATE_PRIVILEGES,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,129,335,10
CONTROL "Show In Taskbar",IDC_CHECK_SHOW_IN_TASKBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,140,335,10
CONTROL "Show indicator a clip has been pasted",IDC_CHECK_SHOW_CLIP_WAS_PASTED,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,151,335,10
EDITTEXT IDC_EDIT_DIFF_PATH,109,162,218,14,ES_AUTOHSCROLL
LTEXT "Diff Application Path",IDC_STATIC_DIFF,25,164,80,8
PUSHBUTTON "...",IDC_BUTTON_DIFF_BROWSE,332,162,17,14
CONTROL "Show indicator a clip has been pasted",IDC_CHECK_SHOW_CLIP_WAS_PASTED,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,151,335,10
END

IDD_OPTIONS_KEYSTROKES DIALOGEX 0, 0, 373, 278
Expand Down Expand Up @@ -909,7 +909,8 @@ BEGIN
GROUPBOX "Accepted Copy Applications (separate by ;)",IDC_STATIC_APP_SEP_DESC,7,178,361,55
PUSHBUTTON "Advanced",IDC_BUTTON_ADVANCED,318,256,50,14
COMBOBOX IDC_COMBO_THEME,67,82,130,95,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "About Theme",IDC_BUTTON_THEME,207,82,106,14
PUSHBUTTON "Preview",IDC_BUTTON_PREVIEW_THEME,207,82,50,14
PUSHBUTTON "About Theme",IDC_BUTTON_THEME,263,82,50,14
PUSHBUTTON "Font",IDC_BUTTON_FONT,67,125,130,14
PUSHBUTTON "Default Font",IDC_BUTTON_DEFAULT_FAULT,207,125,106,14
LTEXT "Theme",IDC_STATIC_THEME,9,82,36,12,SS_CENTERIMAGE
Expand Down
2 changes: 2 additions & 0 deletions CP_Main.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@
<ClCompile Include="src\Md5.cpp" />
<ClCompile Include="src\MessagePumpThread.cpp" />
<ClCompile Include="src\Misc.cpp" />
<ClCompile Include="src\ModernScrollBar.cpp" />
<ClCompile Include="src\MoveToGroupDlg.cpp" />
<ClCompile Include="src\MultiLanguage.cpp" />
<ClCompile Include="src\MyDropTarget.cpp" />
Expand Down Expand Up @@ -875,6 +876,7 @@
<ClInclude Include="src\memdc.h" />
<ClInclude Include="src\MessagePumpThread.h" />
<ClInclude Include="src\Misc.h" />
<ClInclude Include="src\ModernScrollBar.h" />
<ClInclude Include="src\MoveToGroupDlg.h" />
<ClInclude Include="src\MultiLanguage.h" />
<ClInclude Include="src\MyDropTarget.h" />
Expand Down
4 changes: 3 additions & 1 deletion resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,8 @@
#define IDC_RICHEDIT21 2172
#define IDC_MFCLINK2 2172
#define IDC_EDIT_ACTIVE_APP 2173
#define IDC_CHECK_DO_NOT_HIDE_ON_DEACTIVATE 2174
#define IDC_BUTTON_PREVIEW_THEME 2175
#define IDC_EDIT_ADV_FILTER 5001
#define IDC_NEXT_MATCH_BUTTON 5002
#define ID_FIRST_OPTION 32771
Expand Down Expand Up @@ -877,7 +879,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 394
#define _APS_NEXT_COMMAND_VALUE 32999
#define _APS_NEXT_CONTROL_VALUE 2173
#define _APS_NEXT_CONTROL_VALUE 2174
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif
28 changes: 28 additions & 0 deletions src/AdvGeneral.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ END_MESSAGE_MAP()
#define SETTING_CLIP_EDIT_SAVE_DELAY_AFTER_LOAD 105
#define SETTING_ClIP_EDIT_SAVE_DELAY_AFTER_SAVE 106
#define SETTING_WEB_SEARCH_URL 107
#define SETTING_DO_NOT_HIDE_ON_DEACTIVATE 108
#define SETTING_HIDE_TASKBAR_ICON_ON_CLOSE 109
#define SETTING_USE_MODERN_SCROLLBAR 110

BOOL CAdvGeneral::OnInitDialog()
{
Expand Down Expand Up @@ -198,6 +201,7 @@ BOOL CAdvGeneral::OnInitDialog()
AddTrueFalse(pGroupTest, _T("Allow back to back duplicates (if allowing duplicates)"), CGetSetOptions::GetAllowBackToBackDuplicates(), SETTING_ALOW_BACK_TO_BACK_DUPLICATES);

AddTrueFalse(pGroupTest, _T("Always show scroll bar"), CGetSetOptions::GetShowScrollBar(), SETTING_ALWAYS_SHOW_SCROLL_BAR);
AddTrueFalse(pGroupTest, _T("Use modern scroll bar"), CGetSetOptions::GetUseModernScrollBar(), SETTING_USE_MODERN_SCROLLBAR);
AddTrueFalse(pGroupTest, _T("Append Computer Name and IP when receiving clips"), CGetSetOptions::GetAppendRemoveComputerNameAndIPToDescription(), SETTING_APPEND_NAME_IP);

pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Amount of text to save for description"), CGetSetOptions::m_bDescTextSize, _T(""), SETTING_DESC_SIZE));
Expand All @@ -223,6 +227,8 @@ BOOL CAdvGeneral::OnInitDialog()

AddTrueFalse(pGroupTest, _T("Display icon in system tray"), CGetSetOptions::GetShowIconInSysTray(), SETTING_SHOW_TASKBAR_ICON);

AddTrueFalse(pGroupTest, _T("Do not hide Ditto window on deactivate"), CGetSetOptions::GetDoNotHideOnDeactivate(), SETTING_DO_NOT_HIDE_ON_DEACTIVATE);

pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Double shortcut keystroke timeout)"), (long)CGetSetOptions::GetDoubleKeyStrokeTimeout(), _T(""), SETTING_DOUBLE_KEYSTROKE_TIMEOUT));

AddTrueFalse(pGroupTest, _T("Draw swatch for hex, RGB, and HSL colors"), CGetSetOptions::GetDrawCopiedColorCode(), SETTING_DRAW_COPIED_COLOR_CODE);
Expand Down Expand Up @@ -299,6 +305,7 @@ BOOL CAdvGeneral::OnInitDialog()
AddTrueFalse(pGroupTest, _T("Show clips that are in groups in main list"), CGetSetOptions::GetShowAllClipsInMainList(), SETTING_SHOW_GROUP_CLIPS_IN_LIST);
AddTrueFalse(pGroupTest, _T("Show leading whitespace"), CGetSetOptions::GetDescShowLeadingWhiteSpace(), SETTING_SHOW_LEADING_WHITESPACE);
AddTrueFalse(pGroupTest, _T("Show in taskbar"), CGetSetOptions::GetShowInTaskBar(), SETTTING_SHOW_IN_TASKBAR);
AddTrueFalse(pGroupTest, _T("Hide taskbar icon when Ditto window closes"), CGetSetOptions::GetHideTaskbarIconOnClose(), SETTING_HIDE_TASKBAR_ICON_ON_CLOSE);
AddTrueFalse(pGroupTest, _T("Show indicator a clip has been pasted"), CGetSetOptions::GetShowIfClipWasPasted(), SETTING_SHOW_CLIP_PASTED);

AddTrueFalse(pGroupTest, _T("Show message that we received a manual sent clip"), CGetSetOptions::GetShowMsgWhenReceivingManualSentClip(), SETTING_SHOW_MSG_WHEN_RECEIVING_MANUAL_SENT_CLIP);
Expand Down Expand Up @@ -571,6 +578,13 @@ void CAdvGeneral::OnBnClickedOk()
CGetSetOptions::SetShowScrollBar(val);
}
break;
case SETTING_USE_MODERN_SCROLLBAR:
if (wcscmp(pNewValue->bstrVal, pOrigValue->bstrVal) != 0)
{
BOOL val = wcscmp(pNewValue->bstrVal, L"True") == 0;
CGetSetOptions::SetUseModernScrollBar(val);
}
break;
case SETTING_PASTE_AS_ADMIN:
if (wcscmp(pNewValue->bstrVal, pOrigValue->bstrVal) != 0)
{
Expand Down Expand Up @@ -961,6 +975,20 @@ void CAdvGeneral::OnBnClickedOk()
CGetSetOptions::SetWebSearchUrl(pNewValue->bstrVal);
}
break;
case SETTING_DO_NOT_HIDE_ON_DEACTIVATE:
if (wcscmp(pNewValue->bstrVal, pOrigValue->bstrVal) != 0)
{
BOOL val = wcscmp(pNewValue->bstrVal, L"True") == 0;
CGetSetOptions::SetDoNotHideOnDeactivate(val);
}
break;
case SETTING_HIDE_TASKBAR_ICON_ON_CLOSE:
if (wcscmp(pNewValue->bstrVal, pOrigValue->bstrVal) != 0)
{
BOOL val = wcscmp(pNewValue->bstrVal, L"True") == 0;
CGetSetOptions::SetHideTaskbarIconOnClose(val);
}
break;
}
}
}
Expand Down
Loading