CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "+ add: textual (T) "Always On Top" indicator in title-bar"

Browse Source 
This reverts commit 2caef47609.
This commit is contained in:
Rainer Kottenhoff 2019-05-16 08:15:12 +02:00
parent 2caef47609
commit 0070c7bdd5
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Dialogs.c
View File

@ -3455,16 +3455,14 @@ void DialogAdminExe(HWND hwnd, bool bExecInstaller)
//
bool bFreezeAppTitle = false;
const WCHAR* const pszSep = L" - ";
const WCHAR* const pszMod = L"* ";
const WCHAR* const pszPin = L"(T) ";
static const WCHAR *pszSep = L" - ";
static const WCHAR *pszMod = L"* ";
static WCHAR szCachedFile[MAX_PATH] = { L'\0' };
static WCHAR szCachedDisplayName[MAX_PATH] = { L'\0' };
static WCHAR szAdditionalTitleInfo[MAX_PATH] = { L'\0' };
bool SetWindowTitle(HWND hwnd, UINT uIDAppName, bool bIsElevated, UINT uIDUntitled,
LPCWSTR lpszFile, int iFormat, bool bModified, bool bAlwaysOnTop,
LPCWSTR lpszFile, int iFormat, bool bModified,
UINT uIDReadOnly, bool bReadOnly, LPCWSTR lpszExcerpt)
{
if (bFreezeAppTitle)
@ -3484,12 +3482,10 @@ bool SetWindowTitle(HWND hwnd, UINT uIDAppName, bool bIsElevated, UINT uIDUntitl
WCHAR szTitle[MIDSZ_BUFFER] = { L'\0' };
if (bAlwaysOnTop) {
StringCchCat(szTitle, COUNTOF(szTitle), pszPin);
}
if (bModified) {
StringCchCat(szTitle, COUNTOF(szTitle), pszMod);
}
if (bModified)
StringCchCopy(szTitle, COUNTOF(szTitle), pszMod);
else
StringCchCopy(szTitle, COUNTOF(szTitle), L"");
if (StrIsNotEmpty(lpszExcerpt)) {
WCHAR szExcrptFmt[32] = { L'\0' };

3
src/Dialogs.h
View File

@ -52,8 +52,7 @@ int MessageBoxLng(UINT uType, UINT uIdMsg, ...);
INT_PTR InfoBoxLng(UINT uType, LPCWSTR lpstrSetting, UINT uidMessage, ...);
DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID);
bool SetWindowTitle(HWND hwnd, UINT uIDAppName, bool, UINT uIDUntitled, LPCWSTR lpszFile, int iFormat,
bool bModified, bool bAlwaysOnTop, UINT uIDReadOnly, bool bReadOnly, LPCWSTR lpszExcerpt);
bool SetWindowTitle(HWND hwnd, UINT uIDAppName, bool, UINT uIDUntitled, LPCWSTR lpszFile, int iFormat, bool, UINT uIDReadOnly, bool, LPCWSTR lpszExcerpt);
void SetAdditionalTitleInfo(LPCWSTR lpszAddTitleInfo);
void SetWindowTransparentMode(HWND hwnd, bool bTransparentMode, int iOpacityLevel);
void CenterDlgInParent(HWND hDlg);

2
src/Notepad3.c
View File

@ -8474,7 +8474,7 @@ void UpdateToolbar()
static void _UpdateToolbarDelayed()
{
SetWindowTitle(Globals.hwndMain, s_uidsAppTitle, s_bIsElevated, IDS_MUI_UNTITLED, Globals.CurrentFile,
Settings.PathNameFormat, IsSaveNeeded(ISN_GET), Settings.AlwaysOnTop,
Settings.PathNameFormat, IsSaveNeeded(ISN_GET),
IDS_MUI_READONLY, s_bFileReadOnly, s_wchTitleExcerpt);
if (!Settings.ShowToolbar) { return; }