Skip to content

Commit

Permalink
Fix restore from tray, update version to 4.5.
Browse files Browse the repository at this point in the history
  • Loading branch information
benbuck committed May 12, 2017
1 parent 4999d16 commit 941a476
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 11 deletions.
4 changes: 1 addition & 3 deletions RBTray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,7 @@ static bool RemoveWindowFromTray(HWND hwnd) {
}

static void RestoreWindowFromTray(HWND hwnd) {
if (!ShowWindow(hwnd, SW_SHOW)) {
return;
}
ShowWindow(hwnd, SW_SHOW);
SetForegroundWindow(hwnd);
RemoveWindowFromTray(hwnd);
}
Expand Down
26 changes: 19 additions & 7 deletions RBTray.rc
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ CAPTION "About RBTray"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,75,142,50,14
ICON IDI_RBTRAY,IDC_STATIC,7,7,21,20
LTEXT "RBTray 4.4\r\n\r\nThis program is distributed under the GNU General Public License.\r\n\r\nCopyright � 1998-2011,2015\r\n\r\nNikolay Redko\r\nhttp://rbtray.sourceforge.net/\r\n\r\nJ.D. Purcell\r\nhttp://www.moitah.net/\r\n\r\nBenbuck Nason\r\nhttps://github.com/benbuck/rbtray-code",IDC_STATIC,38,7,151,133
ICON IDI_RBTRAY,IDC_STATIC,7,7,20,20
LTEXT "RBTray 4.5\r\n\r\nThis program is distributed under the GNU General Public License.\r\n\r\nCopyright � 1998-2011,2015\r\n\r\nNikolay Redko\r\nhttp://rbtray.sourceforge.net/\r\n\r\nJ.D. Purcell\r\nhttp://www.moitah.net/\r\n\r\nBenbuck Nason\r\nhttps://github.com/benbuck/rbtray-code",IDC_STATIC,38,7,151,133
END


Expand Down Expand Up @@ -89,14 +89,15 @@ END
// remains consistent on all systems.
IDI_RBTRAY ICON "RBTray.ico"


/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,4,0,0
PRODUCTVERSION 4,4,0,0
FILEVERSION 4,5,0,0
PRODUCTVERSION 4,5,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -112,12 +113,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "RBTray"
VALUE "FileVersion", "4.4.0.0"
VALUE "FileVersion", "4.5.0.0"
VALUE "InternalName", "RBTray"
VALUE "LegalCopyright", "Copyright � 1998-2011 Nikolay Redko, J.D. Purcell"
VALUE "LegalCopyright", "Copyright � 1998-2011 Nikolay Redko, J.D. Purcell, Benbuck Nason"
VALUE "OriginalFilename", "RBTray.exe"
VALUE "ProductName", "RBTray"
VALUE "ProductVersion", "4.4.0.0"
VALUE "ProductVersion", "4.5.0.0"
END
END
BLOCK "VarFileInfo"
Expand All @@ -126,6 +127,17 @@ BEGIN
END
END


/////////////////////////////////////////////////////////////////////////////
//
// AFX_DIALOG_LAYOUT
//

IDD_ABOUT AFX_DIALOG_LAYOUT
BEGIN
0
END

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////

Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
A minor fork of RBTray from http://sourceforge.net/p/rbtray/code/

Version 4.4
The only change is to additionally allow minimizing a window using the shift key while right-clicking in the title bar, since some windows have custom minimize button controls that prevent the existing method from working.
The only change is to additionally allow minimizing a window using the shift key while right-clicking in the title bar, since some windows have custom minimize button controls that prevent the existing method from working.

Version 4.5
Add some error handling.
Fix bug in shift key check.
Update project files to VS2015.
4 changes: 4 additions & 0 deletions htdocs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<br>
<span style="font-size: large; font-weight: bold">Changes:</span><br>
<pre>
4.5 fork (2017-May-12) - Benbuck Nason
* Add some error handling.
* Fix bug in shift key check.
* Update project files to VS2015.
4.4 fork (2015-Dec-05) - Benbuck Nason:
* Support minimizing by shift-right-clicking on window title bar.
4.3 (2011-Oct-30):
Expand Down
Binary file modified x64/RBTray.exe
Binary file not shown.
Binary file modified x86/RBTray.exe
Binary file not shown.

0 comments on commit 941a476

Please sign in to comment.