運営コメいろ変更

diff --git a/nlite.suo b/nlite.suo
index ebcdd76..70b6a96 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp
index 7a307ad..fd98270 100644 (file)
--- a/nlite/nlite_commentview.cpp
+++ b/nlite/nlite_commentview.cpp
@@ -11,6 +11,11 @@ namespace nlite{
        //\83R\83\81\83\93\83g\83r\83\85\81[\93à\82Ì\83R\83\93\83g\83\8d\81[\83\8b\83N\83\89\83X
        ///////////////////////////////////////////////////////////////////
 
+       CChatReadEdit::CChatReadEdit(CCommentView &m_master):m_master(m_master){
+
+
+       }
+
        BOOL CChatReadEdit::SetWindowText(const CChatData &chat){
 
                BOOL rslt = FALSE;
@@ -18,6 +23,25 @@ namespace nlite{
                        
                        tstring viewString(regex_replace(tstring(chat.chatBuf),nliteregex::TAGSTRING,nliteregex::NUTHINGSTRING));
                        rslt = __super::SetWindowText(viewString.c_str());
+
+                       CHARFORMAT2 defaultFormat;
+                       this->GetDefaultCharFormat(defaultFormat);
+                       defaultFormat.dwMask |=  CFM_COLOR;
+                       if(chat.premium == 2 || chat.premium == 3){
+
+                               defaultFormat.crTextColor = m_master.viewproperty.ownerStringColor;
+                       }
+                       
+                       else {
+
+                               defaultFormat.crTextColor = m_master.viewproperty.baseStringColor;
+
+                       }
+
+                       BOOL rslt = this->SetDefaultCharFormat(defaultFormat);
+                       
+
+
                        linkStringBeside(viewString,nliteregex::LILNKREGEX);
                        
                        
@@ -81,6 +105,7 @@ namespace nlite{
                int point = -MulDiv(deflogFont.lfHeight,72,picy);
                int twips = point * 20;
                m_defCharFormat.yHeight = twips;
+               m_defCharFormat.dwEffects ^= CFE_AUTOCOLOR;
                _tcscpy(m_defCharFormat.szFaceName,deflogFont.lfFaceName);
                this->SetEventMask(eventMask);
                
@@ -92,7 +117,8 @@ namespace nlite{
        }
 
        CChatChildCtrls::CChatChildCtrls(CCommentView &hMaster):
-       m_master(hMaster)
+       m_master(hMaster),
+       chatDispCtrl(hMaster)
        {
                
                return;
@@ -1256,7 +1282,7 @@ end:
                
                        drowSize.bottom = 0;
 
-                       CChatReadEdit cedit;
+                       CChatReadEdit cedit(self);
                
                        cedit.GeneralCreate(*this,ENM_REQUESTRESIZE,CALCEDIT_ID);
                        cedit.Reset();

diff --git a/nlite/nlite_commentview.h b/nlite/nlite_commentview.h
index 981b5c0..543b957 100644 (file)
--- a/nlite/nlite_commentview.h
+++ b/nlite/nlite_commentview.h
@@ -33,10 +33,13 @@ namespace nlite{
                friend CCommentListWindow;
                friend CChatChildCtrls;
 
+               CCommentView &m_master;
+
+               
                BEGIN_MSG_MAP(CChatReadEdit)
 
                END_MSG_MAP()
-
+               CChatReadEdit(CCommentView &m_master);
                BOOL SetWindowText(const CChatData &str);
 
                VOID Reset();
@@ -52,8 +55,8 @@ namespace nlite{
                friend CChatChildCtrlsList;
        private:
                CChatReadEdit chatDispCtrl;
-               CHyperLink noDispCtrl;
-               CHyperLink userNameDispCtrl;
+//             CHyperLink noDispCtrl;
+//             CHyperLink userNameDispCtrl;
                CCommentView &m_master;
                
 
@@ -327,6 +330,7 @@ namespace nlite{
                friend CCommentListWindow;                                              //\83t\83\8c\83\93\83h\90é\8c¾
                friend CChatChildCtrlsList;
                friend CChatChildCtrls;
+               friend CChatReadEdit;
                //\83v\83\89\83C\83x\81[\83g\8c^\81E\83N\83\89\83X\92è\8b`
        private:
 

diff --git a/nlite/nlite_property.cpp b/nlite/nlite_property.cpp
index bc7072f..b5d78ac 100644 (file)
--- a/nlite/nlite_property.cpp
+++ b/nlite/nlite_property.cpp
@@ -56,7 +56,8 @@ namespace nlite{
                selectSellLineColor(PALETTERGB(255,0,0)),                                               
                normalSellLineColor( PALETTERGB(0,0,0)),
                colLineColor(PALETTERGB(224,224,224)),
-               linkStringColor(PALETTERGB(30,140,255))
+               linkStringColor(PALETTERGB(30,140,255)),
+               ownerStringColor(PALETTERGB(255,0,0))
 
        {
                for(INT_PTR orderIndex = 0;orderIndex < ARRAY_LENGTH(headerOrderArray);orderIndex++){
@@ -265,8 +266,8 @@ namespace nlite{
                NLITE_ATTRIBUTE_WRITE_INT(pWriter,cvp.selectSellLineColor);
                NLITE_ATTRIBUTE_WRITE_INT(pWriter,cvp.colLineColor);
                NLITE_ATTRIBUTE_WRITE_INT(pWriter,cvp.normalSellLineColor);
-
-
+               NLITE_ATTRIBUTE_WRITE_INT(pWriter,cvp.ownerStringColor);
+               
                pWriter->WriteEndElement();
 
 
@@ -438,6 +439,8 @@ namespace nlite{
                        NLITE_R_X_P_I(nliteProperty,cvp,selectSellLineColor);
                        NLITE_R_X_P_I(nliteProperty,cvp,normalSellLineColor);
                        NLITE_R_X_P_I(nliteProperty,cvp,colLineColor);
+                       NLITE_R_X_P_I(nliteProperty,cvp,ownerStringColor);
+                       
                        break;
                case Node::GeneralProperty:
                        NLITE_R_X_P_I(nliteProperty,gp,activeCountTimeFlag);

diff --git a/nlite/nlite_property.h b/nlite/nlite_property.h
index 43d65fd..048d462 100644 (file)
--- a/nlite/nlite_property.h
+++ b/nlite/nlite_property.h
@@ -29,6 +29,7 @@ namespace nlite{
                COLORREF selectSellLineColor;                                                           //\91I\91ð\8e\9e\82Ì\98g\90ü
                COLORREF normalSellLineColor;                                                           //\92Ê\8fí\8e\9e\82Ì\98g\90ü
                COLORREF baseStringColor;                                                                       //\8aî\92ê\82Ì\95¶\8e\9a\90F
+               COLORREF ownerStringColor;                                                                      //\89^\89c\95¶\8e\9a\90F
                COLORREF linkStringColor;                                                                               //\8aî\92ê\82Ì\83n\83C\83p\81[\83\8a\83\93\83N\82Ì\90F
                COLORREF anonymousIDLinkColor;                                                          //\93½\96¼ID\95\\8e¦\90F
                COLORREF colLineColor;                                                                          //\8d\80\96Ú\82Ì\8fc\90ü

diff --git a/nlite/stdafx.h b/nlite/stdafx.h
index 4954d9e..9ca4bf1 100644 (file)
--- a/nlite/stdafx.h
+++ b/nlite/stdafx.h
@@ -11,7 +11,7 @@
 #define WIN32_LEAN_AND_MEAN                                    // Windows \83w\83b\83_\81[\82©\82ç\8eg\97p\82³\82ê\82Ä\82¢\82È\82¢\95\94\95ª\82ð\8f\9c\8aO\82µ\82Ü\82·\81B
 #define _CRT_SECURE_NO_WARNINGS 1                      //vc++\82Ì\82¨\82¹\82Á\82©\82¢\82È\8cx\8d\90\82ð\8fÁ\82·
 #define  _CRT_NON_CONFORMING_SWPRINTFS 1       //vc++\82Ì\82¨\82¹\82Á\82©\82¢\82È\8cx\8d\90\82ð\8fÁ\82·
-#define USE_STUB                                                       //\83X\83^\83u\82ð\8eg\97p\82·\82é\8fê\8d\87\82Í\83R\83\81\83\93\83g\83A\83E\83g\82ð\89ð\8f\9c\82·\82é
+//#define USE_STUB                                                     //\83X\83^\83u\82ð\8eg\97p\82·\82é\8fê\8d\87\82Í\83R\83\81\83\93\83g\83A\83E\83g\82ð\89ð\8f\9c\82·\82é
 #define WINDEBUGER_NOPRINTING                          //\83f\83o\83b\83O\8fo\97Í\82ð\83R\83\93\83\\81[\83\8b\82É\95\\8e¦\82µ\82½\82­\82È\82¢\8fê\8d\87\92è\8b`\82·\82é
 #define _WTL_NO_CSTRING