i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed changing color reset font bug and made the menus update for font and family and font size

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2064 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2002-11-22 09:32:34 +00:00
parent 8776558763
commit d470934c95
1 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/stylededit/StyledEditWindow.cpp
+38 -13
View File
@@ -231,6 +231,7 @@ StyledEditWindow::InitWindow()
font_family plain_family; font_family plain_family;
font_style plain_style; font_style plain_style;
be_plain_font->GetFamilyAndStyle(&plain_family,&plain_style); be_plain_font->GetFamilyAndStyle(&plain_family,&plain_style);
fCurrentFontItem = 0;
int32 numFamilies = count_font_families(); int32 numFamilies = count_font_families();
for ( int32 i = 0; i < numFamilies; i++ ) { for ( int32 i = 0; i < numFamilies; i++ ) {
@@ -429,7 +430,8 @@ StyledEditWindow::MessageReceived(BMessage *message)
const char * fontFamily = 0, * fontStyle = 0; const char * fontFamily = 0, * fontStyle = 0;
void * ptr; void * ptr;
if (message->FindPointer("source",&ptr) == B_OK) { if (message->FindPointer("source",&ptr) == B_OK) {
fontFamily = static_cast<BMenuItem*>(ptr)->Label(); fCurrentFontItem = static_cast<BMenuItem*>(ptr);
fontFamily = fCurrentFontItem->Label();
} }
SetFontStyle(fontFamily, fontStyle); SetFontStyle(fontFamily, fontStyle);
} }
@@ -443,9 +445,9 @@ StyledEditWindow::MessageReceived(BMessage *message)
fontStyle = item->Label(); fontStyle = item->Label();
BMenu * menu = item->Menu(); BMenu * menu = item->Menu();
if (menu != 0) { if (menu != 0) {
BMenuItem * superitem = menu->Superitem(); fCurrentFontItem = menu->Superitem();
if (superitem != 0) { if (fCurrentFontItem != 0) {
fontFamily = superitem->Label(); fontFamily = fCurrentFontItem->Label();
} }
} }
} }
@@ -472,13 +474,6 @@ StyledEditWindow::MessageReceived(BMessage *message)
SetFontColor(&YELLOW); SetFontColor(&YELLOW);
} }
} }
// void *v;
// rgb_color *color;
//
// message->FindPointer("colour",&v);
// color= (rgb_color *) v;
// SetFontColor(color);
} }
break; break;
/*********"Document"-menu*************/ /*********"Document"-menu*************/
@@ -644,7 +639,9 @@ StyledEditWindow::MenusBeginning()
// update the font menu be/interface/GraphicsDefs.h // update the font menu be/interface/GraphicsDefs.h
// unselect the old values // unselect the old values
if (fCurrentFontItem != 0) {
fCurrentFontItem->SetMarked(false); fCurrentFontItem->SetMarked(false);
}
BMenuItem * oldColorItem = fFontColorMenu->FindMarked(); BMenuItem * oldColorItem = fFontColorMenu->FindMarked();
if (oldColorItem != 0) { if (oldColorItem != 0) {
oldColorItem->SetMarked(false); oldColorItem->SetMarked(false);
@@ -661,6 +658,7 @@ StyledEditWindow::MenusBeginning()
fTextView->GetFontAndColor(&font,&sameProperties,&color,&sameColor); fTextView->GetFontAndColor(&font,&sameProperties,&color,&sameColor);
if (sameColor && (color.alpha == 255)) { if (sameColor && (color.alpha == 255)) {
// select the current color
if (color.red == 0) { if (color.red == 0) {
if (color.green == 0) { if (color.green == 0) {
if (color.blue == 0) { if (color.blue == 0) {
@@ -690,7 +688,34 @@ StyledEditWindow::MenusBeginning()
} }
} }
// TODO: select current font & size if (sameProperties & B_FONT_SIZE) {
if ((int)font.Size() == font.Size()) {
// select the current font size
char fontSizeStr[16];
snprintf(fontSizeStr,15,"%i",(int)font.Size());
BMenuItem * item = fFontSizeMenu->FindItem(fontSizeStr);
if (item != 0) {
item->SetMarked(true);
}
}
}
if (sameProperties & B_FONT_FAMILY_AND_STYLE) {
font_family family;
font_style style;
font.GetFamilyAndStyle(&family,&style);
fCurrentFontItem = fFontMenu->FindItem(family);
if (fCurrentFontItem != 0) {
fCurrentFontItem->SetMarked(true);
BMenu * menu = fCurrentFontItem->Submenu();
if (menu != 0) {
BMenuItem * item = menu->FindItem(style);
if (item != 0) {
item->SetMarked(true);
}
}
}
}
} }
void void
@@ -1192,7 +1217,7 @@ StyledEditWindow::SetFontColor(const rgb_color *color)
BFont font; BFont font;
fTextView->GetFontAndColor(&font,&sameProperties,NULL,NULL); fTextView->GetFontAndColor(&font,&sameProperties,NULL,NULL);
fTextView->SetFontAndColor(&font, B_FONT_ALL,color); fTextView->SetFontAndColor(&font, 0, color);
fClean = false; fClean = false;
fUndoCleans = false; fUndoCleans = false;
fRedoCleans = false; fRedoCleans = false;