[Deinterlace-checkins] CVS: DScaler/DScaler ToolbarControl.cpp,1.14,1.15 ToolbarControl.h,1.6,1.7 To
Brought to you by:
adcockj,
dschmelzer
Menu
▾
▴
[Deinterlace-checkins] CVS: DScaler/DScaler ToolbarControl.cpp,1.14,1.15 ToolbarControl.h,1.6,1.7 ToolbarWindow.cpp,1.6,1.7 ToolbarWindow.h,1.4,1.5
|
From: Laurent G. <lau...@us...> - 2003-09-26 20:54:30
|
Update of /cvsroot/deinterlace/DScaler/DScaler
In directory sc8-pr-cvs1:/tmp/cvs-serv4991
Modified Files:
ToolbarControl.cpp ToolbarControl.h ToolbarWindow.cpp
ToolbarWindow.h
Log Message:
Media player toolbar hidden when one skin is selected
Index: ToolbarControl.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/ToolbarControl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** ToolbarControl.cpp 7 Sep 2003 11:05:14 -0000 1.14
--- ToolbarControl.cpp 26 Sep 2003 20:54:06 -0000 1.15
***************
*** 23,26 ****
--- 23,29 ----
//
// $Log$
+ // Revision 1.15 2003/09/26 20:54:06 laurentg
+ // Media player toolbar hidden when one skin is selected
+ //
// Revision 1.14 2003/09/07 11:05:14 laurentg
// Elapsed time slider and skin
***************
*** 192,196 ****
! void CToolbarControl::Set(HWND hWnd, LPCSTR szSkinName, int ForceHide)
{
if (Toolbar1==NULL) //Initialize
--- 195,199 ----
! void CToolbarControl::Set(HWND hWnd, LPCSTR SkinName, int ForceHide, int ForceResize)
{
if (Toolbar1==NULL) //Initialize
***************
*** 288,292 ****
}
! if ((szSkinName != NULL) && (szSkinName[0] == 0)) //Remove skin
{
//Remove skin from main toolbar window
--- 291,295 ----
}
! if ((SkinName != NULL) && (SkinName[0] == 0)) //Remove skin
{
//Remove skin from main toolbar window
***************
*** 345,353 ****
}
! if ((szSkinName != NULL) && (szSkinName[0] != 0)) //Load skin
{
char szSkinIniFile[MAX_PATH*2];
strcpy(szSkinIniFile,GetSkinDirectory());
! strcat(szSkinIniFile,szSkinName);
strcat(szSkinIniFile,"\\skin.ini");
///\todo check if the ini file exists
--- 348,356 ----
}
! if ((SkinName != NULL) && (SkinName[0] != 0)) //Load skin
{
char szSkinIniFile[MAX_PATH*2];
strcpy(szSkinIniFile,GetSkinDirectory());
! strcat(szSkinIniFile,SkinName);
strcat(szSkinIniFile,"\\skin.ini");
///\todo check if the ini file exists
***************
*** 478,482 ****
{
Toolbar1->SetChildPosition(Toolbar1MediaPlayer, LOWORD(m_Toolbar1MediaPlayer->GetValue()), 0);
! if ((HIWORD(m_Toolbar1MediaPlayer->GetValue())&3)==3)
{
Toolbar1->ShowChild(Toolbar1MediaPlayer);
--- 481,489 ----
{
Toolbar1->SetChildPosition(Toolbar1MediaPlayer, LOWORD(m_Toolbar1MediaPlayer->GetValue()), 0);
! // Temporary : hide the toolbar when a skin is enabled
! // TODO : integrate this new toolbar in the skins
! extern char* szSkinName;
! if ( ((HIWORD(m_Toolbar1MediaPlayer->GetValue())&3)==3)
! && ( (szSkinName == NULL) || (szSkinName[0] == 0)) )
{
Toolbar1->ShowChild(Toolbar1MediaPlayer);
***************
*** 498,501 ****
--- 505,512 ----
}
}
+ if (ForceResize)
+ {
+ Toolbar1->ForceUpdateWindowPosition(NULL);
+ }
//Set position & visibility of main toolbar
if ((m_ShowToolbar1->GetValue() && (ForceHide==0)) || (ForceHide==2))
***************
*** 562,570 ****
//Update toolbar position
! void CToolbarControl::Adjust(HWND hWnd, BOOL bRedraw)
{
if ((Toolbar1!=NULL) && Toolbar1->Visible())
{
! Toolbar1->UpdateWindowPosition(hWnd);
if (bRedraw)
{
--- 573,588 ----
//Update toolbar position
! void CToolbarControl::Adjust(HWND hWnd, BOOL bRedraw, BOOL ForceUpdate)
{
if ((Toolbar1!=NULL) && Toolbar1->Visible())
{
! if (ForceUpdate)
! {
! Toolbar1->ForceUpdateWindowPosition(hWnd);
! }
! else
! {
! Toolbar1->UpdateWindowPosition(hWnd);
! }
if (bRedraw)
{
Index: ToolbarControl.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/ToolbarControl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ToolbarControl.h 14 Aug 2003 19:35:37 -0000 1.6
--- ToolbarControl.h 26 Sep 2003 20:54:06 -0000 1.7
***************
*** 37,42 ****
virtual void OnEvent(CEventObject *pEventObject, eEventType Event, long OldValue, long NewValue, eEventType *ComingUp);
! void Set(HWND hWnd, LPCSTR szSkinName, int ForceHide = 0);
! void Adjust(HWND hWnd, BOOL bRedraw);
void UpdateMenu(HMENU hMenu);
void Free();
--- 37,42 ----
virtual void OnEvent(CEventObject *pEventObject, eEventType Event, long OldValue, long NewValue, eEventType *ComingUp);
! void Set(HWND hWnd, LPCSTR SkinName, int ForceHide = 0, int ForceResize = 0);
! void Adjust(HWND hWnd, BOOL bRedraw, BOOL ForceUpdate);
void UpdateMenu(HMENU hMenu);
void Free();
Index: ToolbarWindow.cpp
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/ToolbarWindow.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ToolbarWindow.cpp 7 Sep 2003 19:09:52 -0000 1.6
--- ToolbarWindow.cpp 26 Sep 2003 20:54:06 -0000 1.7
***************
*** 23,26 ****
--- 23,29 ----
//
// $Log$
+ // Revision 1.7 2003/09/26 20:54:06 laurentg
+ // Media player toolbar hidden when one skin is selected
+ //
// Revision 1.6 2003/09/07 19:09:52 laurentg
// Display of toolbars on several rows when not enough space
***************
*** 369,372 ****
--- 372,376 ----
XRPos = w - RightMargin;
row = 0;
+ int in_row = 0;
int Height = 0;
for (n = 0; n < vChildOrder.size(); n++)
***************
*** 399,409 ****
XRPos -= BarLeftWidth + Width + BarRightWidth + ChildLeftRightMargin;
}
! if (XRPos<XLPos)
! {
! // DetachBar(vChildList[i].pChild, 0);
! // DetachBar(vChildList[i].pChild, 1);
! vRowHeight.push_back(Height);
FitHeight += Height;
row++;
Height = 0;
}
--- 403,428 ----
XRPos -= BarLeftWidth + Width + BarRightWidth + ChildLeftRightMargin;
}
! if ( (XRPos<XLPos) && (in_row > 0) )
! {
! // This block of code should allow to erase the separator mark
! // at the end of a line when the next toolbar is on the next line
! // IT DOES NOT WORK WELL
! // if (vChildList[i].pBarLeft != NULL)
! // {
! // vChildList[i].pBarLeft->Hide();
! // DetachBar(vChildList[i].pChild, 1);
! // }
! // if (n > 0)
! // {
! // if (vChildList[vChildOrder[n-1]].pBarRight != NULL)
! // {
! // vChildList[vChildOrder[n-1]].pBarRight->Hide();
! // DetachBar(vChildList[vChildOrder[n-1]].pChild, 0);
! // }
! // }
! vRowHeight.push_back(Height);
FitHeight += Height;
row++;
+ in_row = 0;
Height = 0;
}
***************
*** 412,415 ****
--- 431,435 ----
Height = vChildList[i].pChild->Height();
}
+ in_row++;
}
SetChildRow(vChildList[i].pChild, row);
***************
*** 612,615 ****
--- 632,641 ----
}
}
+ }
+
+ void CToolbarWindow::ForceUpdateWindowPosition(HWND hParentWnd)
+ {
+ bChildOrderChanged = TRUE;
+ UpdateWindowPosition((hParentWnd != NULL) ? hParentWnd : hWndParent);
}
Index: ToolbarWindow.h
===================================================================
RCS file: /cvsroot/deinterlace/DScaler/DScaler/ToolbarWindow.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ToolbarWindow.h 7 Sep 2003 19:09:52 -0000 1.4
--- ToolbarWindow.h 26 Sep 2003 20:54:06 -0000 1.5
***************
*** 106,109 ****
--- 106,110 ----
BOOL Hide();
void UpdateWindowPosition(HWND hParentWnd);
+ void ForceUpdateWindowPosition(HWND hParentWnd);
virtual BOOL LoadSkin(const char *szSkinIniFile, const char *szSection, vector<int> *Results, CBitmapCache *pBitmapCache = NULL);
|