MirandaG15 now works correctly (thanks to Intri for patch) and cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@6753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 10 insertions, 8 deletions

diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.cpp b/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.cpp
index 7cbc355c99..a36b897e2d 100644
--- a/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.cpp
+++ b/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.cpp
@@ -244,7 +244,7 @@ bool CLCDConnectionLogitech::Connect(int iIndex)
 	// check if the specified device exists

 	m_pConnectedDevice = GetAttachedDevice(iIndex);

 	if(m_pConnectedDevice == NULL) {

-		iIndex = (!iIndex || iIndex == LGLCD_DEVICE_BW) ? LGLCD_DEVICE_QVGA : LGLCD_DEVICE_BW; 

+		iIndex = (!iIndex || iIndex == LGLCD_DEVICE_BW) ? LGLCD_DEVICE_BW : LGLCD_DEVICE_QVGA;

 		m_pConnectedDevice = GetAttachedDevice(iIndex);

 		if(m_pConnectedDevice == NULL) {

 			return false;

@@ -259,8 +259,8 @@ bool CLCDConnectionLogitech::Connect(int iIndex)
 	// Now lets open the LCD. We must initialize the g_OpenContext structure.

     ZeroMemory(&OpenContext, sizeof(OpenContext));

     OpenContext.connection = m_hConnection;

-    OpenContext.deviceType = LGLCD_DEVICE_QVGA;

-    OpenContext.device = LGLCD_INVALID_DEVICE;

+	OpenContext.deviceType = m_pConnectedDevice->GetIndex();//LGLCD_DEVICE_QVGA;

+	OpenContext.device = LGLCD_INVALID_DEVICE;

 

     // softbutton callbacks are not needed

     OpenContext.onSoftbuttonsChanged.softbuttonsChangedCallback = softButtonCallback;

@@ -364,13 +364,13 @@ void CLCDConnectionLogitech::OnNotificationCB( DWORD notificationCode, DWORD not
 			int *counter = notifyParm1 == LGLCD_DEVICE_QVGA ? &m_iNumQVGADevices : &m_iNumBWDevices;

 			if(*counter == 0) {

 				SIZE size;

-				if(LGLCD_DEVICE_QVGA) {

+				if(notifyParm1 == LGLCD_DEVICE_QVGA) {

 					size.cx = 320;

 					size.cy = 240;

 					device = new CLgLCDDevice(notifyParm1,size,7,4);

 				} else {

-					size.cx = 320;

-					size.cy = 240;

+					size.cx = 160;

+					size.cy = 43;

 					device = new CLgLCDDevice(notifyParm1,size,4,1);

 				}

 				m_lcdDevices.push_back(device);

diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDInput.cpp b/plugins/MirandaG15/LCDFramework/src/CLCDInput.cpp
index ab5350ec86..d482099de3 100644
--- a/plugins/MirandaG15/LCDFramework/src/CLCDInput.cpp
+++ b/plugins/MirandaG15/LCDFramework/src/CLCDInput.cpp
@@ -689,7 +689,7 @@ void CLCDInput::UpdateOffsets(int iModified)
 				}

 			}

 		

-			iChar += iMaxChars;

+			//iChar += iMaxChars;

 

 			if(m_strText[iChar] == '\n' || sizeLine.cx > GetWidth())

 			{

@@ -755,11 +755,13 @@ void CLCDInput::UpdateOffsets(int iModified)
 				}

 				break;

 			}

+

+			iChar += iMaxChars;

 		}

 		// Update line's width

 		if(iMaxChars > 0)

 		{

-			if(m_strText[iChar] == '\n' && iMaxChars >= 2)

+			if(m_strText[iChar-1] == '\n' && iMaxChars >= 2)

 				m_vLineOffsets[iLine].iWidth = piWidths[iMaxChars-2];

 			else

 				m_vLineOffsets[iLine].iWidth = piWidths[iMaxChars-1];