Revision | 139 (tree) |
---|---|
Time | 2010-09-25 16:20:41 |
Author | goriponsoft |
・タッチUIの判定処理(暫定版)を追加
・ナビゲーションバーの高さの変化に対応できていなかったのを修正
@@ -8,10 +8,6 @@ | ||
8 | 8 | #include "MainWnd.h" |
9 | 9 | |
10 | 10 | /////////////////////////////////////////////////////////////// |
11 | -#define NAVIBAR_HEIGHT_NORMAL (26) | |
12 | -#define NAVIBAR_HEIGHT_TOUCHUI (34) | |
13 | - | |
14 | -/////////////////////////////////////////////////////////////// | |
15 | 11 | //ウィンドウ クラスの登録 |
16 | 12 | ATOM CMainWnd::MainWndRegisterClass(HINSTANCE hInstance, LPTSTR szWindowClass) |
17 | 13 | { |
@@ -149,6 +145,15 @@ | ||
149 | 145 | m_fpHighResolutionScale = (float)GetDeviceCaps(hdc, LOGPIXELSX) / 96; |
150 | 146 | ReleaseDC(0, hdc); |
151 | 147 | |
148 | + //TouchUI判定 | |
149 | + SIPINFO si; | |
150 | + memset(&si, 0, sizeof(si)); | |
151 | + si.cbSize = sizeof(si); | |
152 | + //m_bTouchUI = FALSE; | |
153 | + if (SipGetInfo(&si)) | |
154 | + if ((si.rcVisibleDesktop.top / m_fpHighResolutionScale) < 26) | |
155 | + m_bTouchUI = TRUE; | |
156 | + | |
152 | 157 | //設定読み込み |
153 | 158 | GetSettings(); |
154 | 159 |
@@ -1087,14 +1092,13 @@ | ||
1087 | 1092 | if (SipGetInfo(&si)) |
1088 | 1093 | { |
1089 | 1094 | //SIPあり(PocketPC/Professional/Classic) |
1090 | - y = (si.fdwFlags & SIPF_ON)? 0: (g_MainWnd.m_bTouchUI? NAVIBAR_HEIGHT_TOUCHUI: NAVIBAR_HEIGHT_NORMAL); | |
1091 | - OnSize(RECT_WIDTH(&si.rcVisibleDesktop), RECT_HEIGHT(&si.rcVisibleDesktop) - (int)(y * m_fpHighResolutionScale)); | |
1095 | + y = (si.fdwFlags & SIPF_ON)? 0: (int)(52.0 * m_fpHighResolutionScale - (float)si.rcVisibleDesktop.top); | |
1096 | + OnSize(RECT_WIDTH(&si.rcVisibleDesktop), RECT_HEIGHT(&si.rcVisibleDesktop) - y); | |
1092 | 1097 | } |
1093 | 1098 | else |
1094 | 1099 | { |
1095 | 1100 | //SIPなし(Smartphone/Standard) |
1096 | - y = GetSystemMetrics(SM_CYMENU); | |
1097 | - OnSize(GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYFULLSCREEN) + (int)(y * m_fpHighResolutionScale)); | |
1101 | + OnSize(GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYFULLSCREEN) + (int)(26.0 * m_fpHighResolutionScale)); | |
1098 | 1102 | } |
1099 | 1103 | m_dwLastSipInfo = si.fdwFlags; |
1100 | 1104 |