nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Slightly nicer trust sigil on Windows.

Browse Source 
Re-consider the icon in light of the font size, so that we pick the icon
whose size mostly closely matches the terminal font, rather than always
scaling the default icon.
This commit is contained in:
Jacob Nevins 2019-03-30 15:44:01 +00:00
parent e566972f00
commit ea32967044
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
windows/window.c
View File

@ -293,7 +293,7 @@ static const TermWinVtable windows_termwin_vt = {
static TermWin wintw[1]; static TermWin wintw[1];
static HDC wintw_hdc; static HDC wintw_hdc;
static HICON icon; static HICON trust_icon = INVALID_HANDLE_VALUE;
const bool share_can_be_downstream = true; const bool share_can_be_downstream = true;
const bool share_can_be_upstream = true; const bool share_can_be_upstream = true;
@ -681,8 +681,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
prepare_session(conf); prepare_session(conf);
} }
icon = LoadIcon(inst, MAKEINTRESOURCE(IDI_MAINICON));
if (!prev) { if (!prev) {
WNDCLASSW wndclass; WNDCLASSW wndclass;
@ -691,7 +689,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
wndclass.cbClsExtra = 0; wndclass.cbClsExtra = 0;
wndclass.cbWndExtra = 0; wndclass.cbWndExtra = 0;
wndclass.hInstance = inst; wndclass.hInstance = inst;
wndclass.hIcon = icon; wndclass.hIcon = LoadIcon(inst, MAKEINTRESOURCE(IDI_MAINICON));
wndclass.hCursor = LoadCursor(NULL, IDC_IBEAM); wndclass.hCursor = LoadCursor(NULL, IDC_IBEAM);
wndclass.hbrBackground = NULL; wndclass.hbrBackground = NULL;
wndclass.lpszMenuName = NULL; wndclass.lpszMenuName = NULL;
@ -1500,6 +1498,8 @@ static int get_font_width(HDC hdc, const TEXTMETRIC *tm)
* - verify that the underlined font is the same width as the * - verify that the underlined font is the same width as the
* ordinary one (manual underlining by means of line drawing can * ordinary one (manual underlining by means of line drawing can
* be done in a pinch). * be done in a pinch).
*
* - find a trust sigil icon that will look OK with the chosen font.
*/ */
static void init_fonts(int pick_width, int pick_height) static void init_fonts(int pick_width, int pick_height)
{ {
@ -1665,6 +1665,11 @@ static void init_fonts(int pick_width, int pick_height)
ReleaseDC(hwnd, hdc); ReleaseDC(hwnd, hdc);
DestroyIcon(trust_icon);
trust_icon = LoadImage(hinst, MAKEINTRESOURCE(IDI_MAINICON),
IMAGE_ICON, font_width*2, font_height,
LR_DEFAULTCOLOR);
if (fontsize[FONT_UNDERLINE] != fontsize[FONT_NORMAL]) { if (fontsize[FONT_UNDERLINE] != fontsize[FONT_NORMAL]) {
und_mode = UND_LINE; und_mode = UND_LINE;
DeleteObject(fonts[FONT_UNDERLINE]); DeleteObject(fonts[FONT_UNDERLINE]);
@ -1747,6 +1752,9 @@ static void deinit_fonts(void)
fonts[i] = 0; fonts[i] = 0;
fontflag[i] = false; fontflag[i] = false;
} }
DestroyIcon(trust_icon);
trust_icon = INVALID_HANDLE_VALUE;
} }
static void wintw_request_resize(TermWin *tw, int w, int h) static void wintw_request_resize(TermWin *tw, int w, int h)
@ -4002,7 +4010,7 @@ static void wintw_draw_trust_sigil(TermWin *tw, int x, int y)
x += offset_width; x += offset_width;
y += offset_height; y += offset_height;
DrawIconEx(wintw_hdc, x, y, icon, font_width * 2, font_height, DrawIconEx(wintw_hdc, x, y, trust_icon, font_width * 2, font_height,
0, NULL, DI_NORMAL); 0, NULL, DI_NORMAL);
} }