очень много правок (клавиатура, графика, контекстное меню)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60903 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/graphics/Brush.cpp

@@ -387,6 +387,7 @@ namespace Aggplus
 		m_pImage = NULL;
 		m_bReleaseImage = FALSE;
 		m_bUsePattern = FALSE;
+        Alpha = 255;
 	}
 
 	CBrushTexture::CBrushTexture(const std::wstring& strName, WrapMode wrapMode) : CBrush(BrushTypeTextureFill), m_wrapMode(wrapMode)
@@ -394,6 +395,7 @@ namespace Aggplus
 		m_pImage = new CImage(strName);
 		m_bReleaseImage = TRUE;
 		m_bUsePattern = FALSE;
+        Alpha = 255;
 	}
 
 	CBrushTexture::CBrushTexture(CImage *pImage, WrapMode wrapMode) : CBrush(BrushTypeTextureFill), m_wrapMode(wrapMode)
@@ -401,6 +403,7 @@ namespace Aggplus
 		m_pImage = pImage;
 		m_bReleaseImage = FALSE;
 		m_bUsePattern = FALSE;
+        Alpha = 255;
 	}
 	
 	CBrushTexture::~CBrushTexture() 

DesktopEditor/graphics/Brush.h

@@ -168,6 +168,8 @@ public:
 
 	INT m_bUsePattern;
 	CColor m_colors[2];
+    
+    BYTE Alpha;
 };
 }
 

DesktopEditor/graphics/Graphics.h

@@ -304,7 +304,11 @@ protected:
 	void DoFillPathGradient2(CBrushLinearGradient *pBrush);
 	void DoFillPathHatch(CBrushHatch *pBrush);
 	void DoFillPathTextureClampSz(const CMatrix &mImgMtx, const void *pImgBuff, DWORD dwImgWidth, DWORD dwImgHeight, int nImgStride);
-	void DoFillPathTextureClampSz2(const CMatrix &mImgMtx, const void *pImgBuff, DWORD dwImgWidth, DWORD dwImgHeight, int nImgStride);
+	void DoFillPathTextureClampSz2(const CMatrix &mImgMtx, const void *pImgBuff, DWORD dwImgWidth, DWORD dwImgHeight, int nImgStride, BYTE Alpha = 255);
+    
+    template<class ColorSpacePix>
+    void DoFillPathTextureClampSz3(const CMatrix &mImgMtx, const void *pImgBuff, DWORD dwImgWidth, DWORD dwImgHeight, int nImgStride, Aggplus::WrapMode wrapmode, BYTE Alpha = 255);
+    
 	void DoFillPath(const CBrush* Brush);
 
 	// text methods

DesktopEditor/graphics/GraphicsRenderer.cpp

@@ -806,6 +806,8 @@ HRESULT CGraphicsRenderer::DrawPath(const LONG& nType)
 						pTextureBrush->m_colors[0] = Aggplus::CColor((BYTE)m_oBrush.Alpha1, m_oBrush.Color1);
 						pTextureBrush->m_colors[1] = Aggplus::CColor((BYTE)m_oBrush.Alpha2, m_oBrush.Color2);
 					}
+                    
+                    pTextureBrush->Alpha = (BYTE)m_oBrush.TextureAlpha;
 				}
 
 				pBrush = pTextureBrush;

DesktopEditor/graphics/ImageFilesCache.h

@@ -98,13 +98,13 @@ public:
 		if (nCount >= m_lMaxCount)
 		{
 			int nNeedDelete = nCount - m_lMaxCount;
-			for (std::map<std::wstring,CCacheImage*>::iterator it2 = m_mapImages.begin(); it2 != m_mapImages.end(); ++it2)
+            
+            std::map<std::wstring,CCacheImage*>::iterator it2 = m_mapImages.begin();
+            while (nNeedDelete > 0 && it2 != m_mapImages.end())
 			{
-				if (nNeedDelete == 0)
-					break;
-
 				it2->second->Release();
-				m_mapImages.erase(it2);
+				it2 = m_mapImages.erase(it2);
+                --nNeedDelete;
 			}
 		}