Control watermark display with registry entry; document the registry entry

Ticket: 5609
Tags: pullup
Target_Version: 1.6.3

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19769 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/identity/ui/credwnd.c b/src/windows/identity/ui/credwnd.c
index c1b824e500f7c54ad6d5c721b68a2c33a1daca12..f991fd04668cf9cae0ca0c9aef2c7cac55aad4b2 100644 (file)
--- a/src/windows/identity/ui/credwnd.c
+++ b/src/windows/identity/ui/credwnd.c
@@ -33,6 +33,8 @@ khm_int32 khui_cw_flag_id;
 
 khm_int32 attr_to_action[KCDB_ATTR_MAX_ID + 1];
 
+khm_int32   bHideWatermarks = 0;
+
 void
 khm_set_cw_element_font(wchar_t * name, LOGFONT * pfont) {
     khm_handle csp_cw = NULL;
@@ -462,6 +464,8 @@ cw_load_view(khui_credwnd_tbl * tbl, wchar_t * view, HWND hwnd) {
                                  &hc_cw)))
         return;
 
+    khc_read_int32(hc_cw, L"HideWatermarks", &bHideWatermarks);
+
     if(KHM_FAILED(khc_open_space(hc_cw, L"Views", KHM_PERM_READ, &hc_vs)))
         goto _exit;
 
@@ -2274,7 +2278,8 @@ cw_erase_rect(HDC hdc,
         rlogo.right = r_wnd->right;
         rlogo.top = r_wnd->bottom - tbl->kbm_logo_shade.cy;
         rlogo.bottom = r_wnd->bottom;
-        rie = IntersectRect(&ri, r_erase, &rlogo);
+        if (bHideWatermarks)    {rie = FALSE;}
+        else                    {rie = IntersectRect(&ri, r_erase, &rlogo);}
     } else {
         ZeroMemory(&rlogo, sizeof(rlogo));
         ZeroMemory(&ri, sizeof(ri));

diff --git a/src/windows/identity/ui/uiconfig.csv b/src/windows/identity/ui/uiconfig.csv
index b23f5e7ff40f46441f4023b6264f117718b6a94c..0c76dc0658ad80e0c3c02123f07547cd7486667d 100644 (file)
--- a/src/windows/identity/ui/uiconfig.csv
+++ b/src/windows/identity/ui/uiconfig.csv
@@ -4,6 +4,7 @@ CredWindow,KC_SPACE,0,"Options for the credentials window as well as the Network
   AutoStart,KC_INT32,0,"[PRIVATE] Boolean. Start Network Identity Manager automatically when the current user logs in."\r
   AutoImport,KC_INT32,1,"Boolean. Import credentials from the LSA cache when Network Identity Manager starts."\r
   AutoDetectNet,KC_INT32,1,"Boolean. Automatically detect network connectivity changes."\r
+  HideWatermark,KC_INT32,0,"Boolean. Suppress watermark in Credentials display.  NOTE:  there is no guarantee that this value will exist in future versions."\r
   KeepRunning,KC_INT32,1,"Boolean. Run from the system notification area after the main window is closed."\r
   DefaultView,KC_STRING,ByIdentity,"[PRIVATE] Name of the default view in Advanced mode."\r
   DefaultViewMini,KC_STRING,CompactIdentity,"[PRIVATE] Name of the default view in Basic mode."\r