Update to 0.7.0

comdlg32 · Mar 5, 2022 · 97aac43 · 97aac43
1 parent ad59453
commit 97aac43
Show file tree

Hide file tree

Showing 135 changed files with 3,935 additions and 4,859 deletions.
diff --git a/Documentation/Compiling SaltedExplorer.docx b/Documentation/Compiling SaltedExplorer.docx
diff --git a/README b/README
@@ -2,9 +2,7 @@ SaltedExplorer
 --------------
 Compiling instructions are in "Documentation\Compiling SaltedExplorer.docx"
 
-SaltedExplorer is a fork of Explorer++, designed to look like Windows 2000's explorer.
+SaltedExplorer is an alternative to Windows Explorer, with themes support and more.
 
 2022 Toiletflusher and XP Pro
-www.saltedexplorer.tk
-
-actually xp pro mostly worked for this lol
+www.saltedexplorer.ml
diff --git a/SaltedExplorer/DisplayWindow/DisplayWindow.cpp b/SaltedExplorer/DisplayWindow/DisplayWindow.cpp
@@ -2,7 +2,7 @@
  *
  * Project: DisplayWindow
  * File: DisplayWindow.cpp
- * License: GPL - See COPYING in the top level directory
+ *
  *
  * Creates and manages a 'display window'. This window
  * can be used to show various information (e.g. file
@@ -138,6 +138,7 @@ DWInitialSettings_t *pInitialSettings)
 	m_SurroundColor	= pInitialSettings->SurroundColor;
 	m_TextColor		= pInitialSettings->TextColor;
 	m_hDisplayFont	= pInitialSettings->hFont;
+	m_bVertical		= FALSE;
 
 	m_hbmThumbnail = NULL;
 	m_bShowThumbnail = FALSE;
@@ -367,6 +368,11 @@ WPARAM wParam,LPARAM lParam)
 			OnSize(wParam,lParam);
 			break;
 
+		case WM_USER_DISPLAYWINDOWMOVED:
+			m_bVertical = (BOOL)wParam;
+			InvalidateRect(m_hDisplayWindow, NULL, TRUE);
+			break;
+
 		case WM_DESTROY:
 			//OnDestroyWindow();
 			break;

diff --git a/SaltedExplorer/DisplayWindow/DisplayWindow.h b/SaltedExplorer/DisplayWindow/DisplayWindow.h
@@ -61,6 +61,7 @@ SendMessage(hDisplay,DWM_CLEARTEXTBUFFER,(WPARAM)0,(LPARAM)0)
 #define DisplayWindow_SetLine(hDisplay,iLine,szText) \
 SendMessage(hDisplay,DWM_SETLINE,(WPARAM)iLine,(LPARAM)szText)
 
+#define WM_USER_DISPLAYWINDOWMOVED		(WM_APP + 99)
 #define WM_USER_DISPLAYWINDOWRESIZED	(WM_APP + 100)
 
 #define WM_NDW_ICONRCLICK	(WM_APP + 101)
@@ -195,6 +196,7 @@ class CDisplayWindow : public IDisplayWindowMain
 	HBITMAP m_hBitmapBackground;
 	HICON m_hMainIcon;
 	HFONT m_hDisplayFont;
+	BOOL  m_bVertical;
 	HANDLE m_hFirstCycleImage;
 	WIN32_FIND_DATA m_wfdCycle;
 };

diff --git a/SaltedExplorer/DisplayWindow/MsgHandler.cpp b/SaltedExplorer/DisplayWindow/MsgHandler.cpp
@@ -2,7 +2,7 @@
  *
  * Project: DisplayWindow
  * File: MsgHandler.cpp
- * License: GPL - See COPYING in the top level directory
+ *
  *
  * Handles GUI messages for the display window.
  *
@@ -70,7 +70,15 @@ void CDisplayWindow::DrawGradientFill(HDC hdc,RECT *rc,RECT *UpdateRect)
 	/* This draws a separator line across the top edge of the window,
 	so that it is visually separated from other windows. */
 	Gdiplus::Pen NewPen(BORDER_COLOUR,1);
-	graphics.DrawLine(&NewPen,0,0,rc->right,0);
+
+	if (m_bVertical)
+	{
+		graphics.DrawLine(&NewPen,0,0,0,rc->bottom);
+	}
+	else
+	{
+		graphics.DrawLine(&NewPen,0,0,rc->right,0);
+	}
 }
 
 void CDisplayWindow::PatchBackground(HDC hdc,RECT *rc,RECT *UpdateRect)
@@ -373,12 +381,13 @@ LONG CDisplayWindow::OnMouseMove(LPARAM lParam)
 		/* Notify the main window, so that it can redraw/reposition
 		its other windows. */
 		SendMessage(GetParent(m_hDisplayWindow),
-			WM_USER_DISPLAYWINDOWRESIZED,(WPARAM)(rc.bottom - CursorPos.y),0);
+			WM_USER_DISPLAYWINDOWRESIZED,
+			(WPARAM)MAKEWPARAM(rc.right - CursorPos.x, rc.bottom - CursorPos.y),0);
 	}
 
-	if(CursorPos.y <= (rc.top + 5))
+	if(m_bVertical && CursorPos.x <= (rc.left + 5) || !m_bVertical && CursorPos.y <= (rc.top + 5))
 	{
-		SetCursor(LoadCursor(NULL,IDC_SIZENS));
+		SetCursor(LoadCursor(NULL,m_bVertical ? IDC_SIZEWE : IDC_SIZENS));
 	}
 
 	/* If there is a thumbnail preview
@@ -412,9 +421,9 @@ void CDisplayWindow::OnLButtonDown(LPARAM lParam)
 
 	GetClientRect(m_hDisplayWindow,&rc);
 
-	if(CursorPos.y <= (rc.top + 5))
+	if(m_bVertical && CursorPos.x <= (rc.left + 5) || !m_bVertical && CursorPos.y <= (rc.top + 5))
 	{
-		SetCursor(LoadCursor(NULL,IDC_SIZENS));
+		SetCursor(LoadCursor(NULL, m_bVertical ? IDC_SIZEWE : IDC_SIZENS));
 		m_bSizing = TRUE;
 		SetFocus(m_hDisplayWindow);
 		SetCapture(m_hDisplayWindow);

diff --git a/SaltedExplorer/Helper/BaseDialog.cpp b/SaltedExplorer/Helper/BaseDialog.cpp
@@ -2,11 +2,10 @@
  *
  * Project: Helper
  * File: BaseDialog.cpp
- * License: GPL - See COPYING in the top level directory
  *
  * Provides a degree of abstraction off a standard dialog.
  *
- 
+ * Toiletflusher and XP Pro
  * www.saltedexplorer.ml
  *
  *****************************************************************/
@@ -101,6 +100,11 @@ INT_PTR CALLBACK CBaseDialog::BaseDialogProc(HWND hDlg,UINT uMsg,
 				reinterpret_cast<HDC>(wParam));
 			break;
 
+		case WM_CTLCOLOREDIT:
+			return OnCtlColorEdit(reinterpret_cast<HWND>(lParam),
+				reinterpret_cast<HDC>(wParam));
+			break;
+
 		case WM_TIMER:
 			return OnTimer(static_cast<int>(wParam));
 			break;
@@ -258,6 +262,11 @@ INT_PTR CBaseDialog::OnCtlColorStatic(HWND hwnd,HDC hdc)
 	return 0;
 }
 
+INT_PTR CBaseDialog::OnCtlColorEdit(HWND hwnd,HDC hdc)
+{
+	return 0;
+}
+
 BOOL CBaseDialog::OnCommand(WPARAM wParam,LPARAM lParam)
 {
 	return 1;

diff --git a/SaltedExplorer/Helper/BaseDialog.h b/SaltedExplorer/Helper/BaseDialog.h
@@ -40,6 +40,7 @@ class CBaseDialog
 	virtual BOOL	OnInitDialog();
 	virtual BOOL	OnTimer(int iTimerID);
 	virtual INT_PTR	OnCtlColorStatic(HWND hwnd,HDC hdc);
+	virtual INT_PTR	OnCtlColorEdit(HWND hwnd,HDC hdc);
 	virtual BOOL	OnCommand(WPARAM wParam,LPARAM lParam);
 	virtual BOOL	OnNotify(NMHDR *pnmhdr);
 	virtual BOOL	OnGetMinMaxInfo(LPMINMAXINFO pmmi);