[commit] r2692 - in trunk/GME: CSGUI Gme MgaUtil ObjectInspector
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Thu Aug 24 15:37:41 CDT 2017
Author: ksmyth
Date: Thu Aug 24 15:37:41 2017
New Revision: 2692
Log:
DPI/size fixes
Modified:
trunk/GME/CSGUI/WelcomeScreen.Designer.cs
trunk/GME/CSGUI/WelcomeScreen.cs
trunk/GME/Gme/GME.rc
trunk/GME/Gme/ModelPropertiesDlgBar.cpp
trunk/GME/MgaUtil/CompDlg.cpp
trunk/GME/MgaUtil/CompDlg.h
trunk/GME/ObjectInspector/InspectorDefs.h
trunk/GME/ObjectInspector/InspectorList.cpp
trunk/GME/ObjectInspector/InspectorList.h
Modified: trunk/GME/CSGUI/WelcomeScreen.Designer.cs
==============================================================================
--- trunk/GME/CSGUI/WelcomeScreen.Designer.cs Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/CSGUI/WelcomeScreen.Designer.cs Thu Aug 24 15:37:41 2017 (r2692)
@@ -59,9 +59,11 @@
//
// grpRecents
//
+ this.grpRecents.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.grpRecents.Location = new System.Drawing.Point(170, 12);
this.grpRecents.Name = "grpRecents";
- this.grpRecents.Size = new System.Drawing.Size(690, 306);
+ this.grpRecents.Size = new System.Drawing.Size(919, 306);
this.grpRecents.TabIndex = 2;
this.grpRecents.TabStop = false;
this.grpRecents.Text = "Recent Projects";
Modified: trunk/GME/CSGUI/WelcomeScreen.cs
==============================================================================
--- trunk/GME/CSGUI/WelcomeScreen.cs Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/CSGUI/WelcomeScreen.cs Thu Aug 24 15:37:41 2017 (r2692)
@@ -60,7 +60,7 @@
{
string recent = recent_;
LinkLabel recentLink = new System.Windows.Forms.LinkLabel();
- recentLink.Text = recent;
+ recentLink.Text = recent.Substring("MGA=".Length);
recentLink.Location = new Point(7, y);
recentLink.AutoSize = false;
recentLink.AutoEllipsis = true;
Modified: trunk/GME/Gme/GME.rc
==============================================================================
--- trunk/GME/Gme/GME.rc Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/Gme/GME.rc Thu Aug 24 15:37:41 2017 (r2692)
@@ -744,16 +744,16 @@
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- EDITTEXT IDC_NAME,37,2,68,12,ES_AUTOHSCROLL
- EDITTEXT IDC_KINDNAME,107,2,68,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- COMBOBOX IDC_ASPECT,203,2,65,272,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_TYPENAME,292,2,68,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- COMBOBOX IDC_ZOOMS,386,2,41,272,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ EDITTEXT IDC_NAME,37,2,88,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_KINDNAME,127,2,68,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
+ COMBOBOX IDC_ASPECT,223,2,65,272,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ EDITTEXT IDC_TYPENAME,312,2,68,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
+ COMBOBOX IDC_ZOOMS,406,2,41,272,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
ICON IDI_INSTANCEMARK_ICON,IDC_INSTANCEMARK,0,0,20,20,SS_REALSIZEIMAGE | NOT WS_VISIBLE
LTEXT "Name:",IDC_STATIC,15,4,21,8
- LTEXT "Aspect:",IDC_STATIC,177,4,24,8
- RTEXT "Base:",IDC_BASETYPE_LABEL,270,4,19,8
- LTEXT "Zoom:",IDC_STATIC,364,4,22,8
+ LTEXT "Aspect:",IDC_STATIC,197,4,24,8
+ RTEXT "Base:",IDC_BASETYPE_LABEL,290,4,19,8
+ LTEXT "Zoom:",IDC_STATIC,384,4,22,8
ICON IDI_TYPEMARK_ICON,IDC_TYPEMARK,0,0,20,20,SS_REALSIZEIMAGE
END
Modified: trunk/GME/Gme/ModelPropertiesDlgBar.cpp
==============================================================================
--- trunk/GME/Gme/ModelPropertiesDlgBar.cpp Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/Gme/ModelPropertiesDlgBar.cpp Thu Aug 24 15:37:41 2017 (r2692)
@@ -30,8 +30,8 @@
void CModelPropertiesDlgBar::ShowType()
{
- // FIXME: fix for DPI
- GetDlgItem(IDC_TYPEMARK)->MoveWindow(6,8,16,16);
+ int size = (int)(16.0 * GetDC()->GetDeviceCaps(LOGPIXELSY) / 96.0);
+ GetDlgItem(IDC_TYPEMARK)->MoveWindow(6, 8, size, size);
GetDlgItem(IDC_TYPEMARK)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_INSTANCEMARK)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_BASETYPE_LABEL)->SetWindowText(_T("Base:"));
@@ -39,9 +39,9 @@
void CModelPropertiesDlgBar::ShowInstance()
{
- // FIXME: fix for DPI
GetDlgItem(IDC_TYPEMARK)->ShowWindow(SW_HIDE);
- GetDlgItem(IDC_INSTANCEMARK)->MoveWindow(6,8,16,16);
+ int size = (int)(16.0 * GetDC()->GetDeviceCaps(LOGPIXELSY) / 96.0);
+ GetDlgItem(IDC_INSTANCEMARK)->MoveWindow(6, 8, size, size);
GetDlgItem(IDC_INSTANCEMARK)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_BASETYPE_LABEL)->SetWindowText(_T("Type:"));
}
Modified: trunk/GME/MgaUtil/CompDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/CompDlg.cpp Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/MgaUtil/CompDlg.cpp Thu Aug 24 15:37:41 2017 (r2692)
@@ -66,6 +66,7 @@
ON_BN_CLICKED(IDC_RADIOUSER, &CCompDlg::OnBnClickedRadiouser)
ON_BN_CLICKED(IDC_RADIOBOTH, &CCompDlg::OnBnClickedRadioboth)
ON_NOTIFY(HDN_ITEMCLICK, 0, OnAllCompsHeader)
+ ON_WM_GETMINMAXINFO()
END_MESSAGE_MAP()
@@ -119,19 +120,19 @@
lvc.mask = LVCF_WIDTH | LVCF_TEXT;
lvc.pszText = _T("Name");
- lvc.cx = 150;
+ lvc.cx = (int)(150.0 * GetDC()->GetDeviceCaps(LOGPIXELSY) / 96.0);;
VERIFYTHROW( m_list.InsertColumn(0, &lvc) != -1 );
lvc.pszText = _T("Type");
- lvc.cx = 80;
+ lvc.cx = (int)(80.0 * GetDC()->GetDeviceCaps(LOGPIXELSY) / 96.0);
VERIFYTHROW( m_list.InsertColumn(1, &lvc) != -1 );
lvc.pszText = _T("ProgID");
- lvc.cx = 200;
+ lvc.cx = (int)(200.0 * GetDC()->GetDeviceCaps(LOGPIXELSY) / 96.0);
VERIFYTHROW( m_list.InsertColumn(2, &lvc) != -1 );
lvc.pszText = _T("Path");
- lvc.cx = 300;
+ lvc.cx = (int)(300.0 * GetDC()->GetDeviceCaps(LOGPIXELSY) / 96.0);
VERIFYTHROW( m_list.InsertColumn(3, &lvc) != -1 );
iconlist.Create(IDB_BITMAP1,16,0,15);
@@ -793,3 +794,10 @@
}
}
}
+
+
+void CCompDlg::OnGetMinMaxInfo(MINMAXINFO* lpMMI)
+{
+ lpMMI->ptMinTrackSize.x = 800;
+ lpMMI->ptMinTrackSize.y = 380;
+}
Modified: trunk/GME/MgaUtil/CompDlg.h
==============================================================================
--- trunk/GME/MgaUtil/CompDlg.h Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/MgaUtil/CompDlg.h Thu Aug 24 15:37:41 2017 (r2692)
@@ -85,6 +85,8 @@
CRect GetWindowSizeFromResource(void) const;
void MoveControl(int nID, int offsetX, int offsetY, int deltaWidth, int deltaHeight,
bool defer = false, HDWP* pdwp = NULL);
+public:
+ afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
};
//{{AFX_INSERT_LOCATION}}
Modified: trunk/GME/ObjectInspector/InspectorDefs.h
==============================================================================
--- trunk/GME/ObjectInspector/InspectorDefs.h Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/ObjectInspector/InspectorDefs.h Thu Aug 24 15:37:41 2017 (r2692)
@@ -20,7 +20,7 @@
#define INSP_MIN_SIZEY 100
#define INSP_LEFT_MARGIN 16
-#define INSP_DIVIDER_POSITION 100
+#define INSP_DIVIDER_POSITION 120
#define INSP_MOUSE_RADIUS 1
#define INSP_PLUS_MINUS_BUTTON_SIZE 9
Modified: trunk/GME/ObjectInspector/InspectorList.cpp
==============================================================================
--- trunk/GME/ObjectInspector/InspectorList.cpp Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/ObjectInspector/InspectorList.cpp Thu Aug 24 15:37:41 2017 (r2692)
@@ -56,6 +56,7 @@
ON_COMMAND(ID_LISTCONTEXT_COPY, OnListContextCopy)
ON_COMMAND(ID_OPENREFERED, OnOpenRefered)
//}}AFX_MSG_MAP
+ ON_WM_CREATE()
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@@ -1302,3 +1303,13 @@
}
Invalidate();
}
+
+
+int CInspectorList::OnCreate(LPCREATESTRUCT lpCreateStruct)
+{
+ if (CListBox::OnCreate(lpCreateStruct) == -1)
+ return -1;
+
+ m_Settings.m_nDivider = INSP_DIVIDER_POSITION * GetDC()->GetDeviceCaps(LOGPIXELSY) / 96;
+ return 0;
+}
Modified: trunk/GME/ObjectInspector/InspectorList.h
==============================================================================
--- trunk/GME/ObjectInspector/InspectorList.h Thu Aug 24 15:37:35 2017 (r2691)
+++ trunk/GME/ObjectInspector/InspectorList.h Thu Aug 24 15:37:41 2017 (r2692)
@@ -121,6 +121,8 @@
int m_ItemHeight;
int m_ComboboxLineHeight;
+public:
+ afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
};
/////////////////////////////////////////////////////////////////////////////
More information about the gme-commit
mailing list