chrome/app/cf_resources.rc - Issue 18769007: Make the dismiss button on the CF infobar be an image button.

Side by Side Diff: chrome/app/cf_resources.rc

Issue 18769007: Make the dismiss button on the CF infobar be an image button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | chrome/app/chromium_strings.grd » ('j') | chrome_frame/turndown_prompt/turndown_prompt_window.cc » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5	5

6 #define APSTUDIO_READONLY_SYMBOLS	6 #define APSTUDIO_READONLY_SYMBOLS

7 /////////////////////////////////////////////////////////////////////////////	7 /////////////////////////////////////////////////////////////////////////////

8 //	8 //

9 // Generated from the TEXTINCLUDE 2 resource.	9 // Generated from the TEXTINCLUDE 2 resource.

10 //	10 //

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD	44 STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD

45 FONT 8, "MS Shell Dlg", 400, 0, 0x0	45 FONT 8, "MS Shell Dlg", 400, 0, 0x0

46 BEGIN	46 BEGIN

47 LTEXT "This site recommends Google Chrome Frame (already installed ).",IDC_PROMPT_MESSAGE,16,3,207,8	47 LTEXT "This site recommends Google Chrome Frame (already installed ).",IDC_PROMPT_MESSAGE,16,3,207,8

48 LTEXT "Learn more.",IDC_PROMPT_LINK,233,3,42,8	48 LTEXT "Learn more.",IDC_PROMPT_LINK,233,3,42,8

49 ICON IDI_CHROME_FRAME_ICON,IDC_PROMPT_ICON,3,2,23,17,0,WS_EX_TRAN SPARENT	49 ICON IDI_CHROME_FRAME_ICON,IDC_PROMPT_ICON,3,2,23,17,0,WS_EX_TRAN SPARENT

50 DEFPUSHBUTTON "Enable",IDACTIVATE,280,2,50,12	50 DEFPUSHBUTTON "Enable",IDACTIVATE,280,2,50,12

51 PUSHBUTTON "Ignore",IDNEVER,340,2,50,12	51 PUSHBUTTON "Ignore",IDNEVER,340,2,50,12

52 END	52 END

53	53

54 IDD_CHROME_FRAME_TURNDOWN_PROMPT DIALOGEX 0, 0, 393, 14	54 IDD_CHROME_FRAME_TURNDOWN_PROMPT DIALOGEX 0, 0, 393, 14
	grt (UTC plus 2) 2013/07/22 16:07:27 the dialog is 14px tall, yet IDDISMISS is 18. how the dialog is 14px tall, yet IDDISMISS is 18. how is this correct? robertshield 2013/07/22 19:58:57 It may be specified as 14 px tall, but it renders Show quoted text On 2013/07/22 16:07:27, grt wrote: > the dialog is 14px tall, yet IDDISMISS is 18. how is this correct? It may be specified as 14 px tall, but it renders as 22 px or so.
55 STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD	55 STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD

56 FONT 8, "MS Shell Dlg", 400, 0, 0x0	56 FONT 8, "MS Shell Dlg", 400, 0, 0x0

57 BEGIN	57 BEGIN

58 LTEXT "This site is using the Chrome Frame plug-in which will soon be unsupported. Please uninstall it and upgrade to a modern browser.",IDC_TD_PR OMPT_MESSAGE,3,3,414,8	58 LTEXT "This site is using the Chrome Frame plug-in which will soon be unsupported. Please uninstall it and upgrade to a modern browser.",IDC_TD_PR OMPT_MESSAGE,3,3,414,8

59 LTEXT "Learn more.",IDC_TD_PROMPT_LINK,238,3,42,8	59 LTEXT "Learn more.",IDC_TD_PROMPT_LINK,238,3,42,8

60 PUSHBUTTON "Uninstall",IDUNINSTALL,285,2,50,12	60 PUSHBUTTON "Uninstall",IDUNINSTALL,318,2,50,12
	grt (UTC plus 2) 2013/07/22 16:07:27 since your change shrinks IDDISMISS from a width o since your change shrinks IDDISMISS from a width of 50 down to 18, i would have expected IDUNINSTALL to now be at 317 and for IDDISMISS to be at 372. did the spacing between the two need to change for it to look nice? robertshield 2013/07/22 19:58:57 The spacing is slightly larger to line up with the Show quoted text On 2013/07/22 16:07:27, grt wrote: > since your change shrinks IDDISMISS from a width of 50 down to 18, i would have > expected IDUNINSTALL to now be at 317 and for IDDISMISS to be at 372. did the > spacing between the two need to change for it to look nice? The spacing is slightly larger to line up with the right edge of buttons on any chrome infobar appearing below. Tweaked slightly to get them to line up perfectly.
61 DEFPUSHBUTTON "Dismiss",IDDISMISS,340,2,50,12	61 DEFPUSHBUTTON "Dismiss",IDDISMISS,378,2,18,18
	grt (UTC plus 2) 2013/07/22 16:07:27 378 + 18 = 396, which is greater than the width of 378 + 18 = 396, which is greater than the width of the dialog (393). why so? robertshield 2013/07/22 19:58:57 This was probably an error, although it was masked Show quoted text On 2013/07/22 16:07:27, grt wrote: > 378 + 18 = 396, which is greater than the width of the dialog (393). why so? This was probably an error, although it was masked by the re-layouting code. Changed to 373, which should provide a 2 px offset from the right of the dialog.
62 END	62 END

	63
	grt (UTC plus 2) 2013/07/22 16:07:27 it looks like the cf_resources.rc in my checkout a it looks like the cf_resources.rc in my checkout already ends with the right number of newlines. does your patch add a new one? robertshield 2013/07/22 19:58:57 Done. Show quoted text On 2013/07/22 16:07:27, grt wrote: > it looks like the cf_resources.rc in my checkout already ends with the right > number of newlines. does your patch add a new one? Done.
OLD	NEW