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

DeskCalc: Style fixes

Browse Source
This commit is contained in:
John Scipione
2016-07-20 10:47:04 -07:00
parent 468d852266
commit 572ecd207d
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskcalc/CalcView.cpp
+14 -9
View File
@@ -329,7 +329,8 @@ CalcView::MessageReceived(BMessage* message)
{ {
int32 end = fExpressionTextView->TextLength(); int32 end = fExpressionTextView->TextLength();
int32 start = end - 3; int32 start = end - 3;
if (fEnabled || strcmp(fExpressionTextView->Text() + start, "...") != 0) { if (fEnabled || strcmp(fExpressionTextView->Text() + start,
"...") != 0) {
// stop the message runner // stop the message runner
delete fEvaluateMessageRunner; delete fEvaluateMessageRunner;
fEvaluateMessageRunner = NULL; fEvaluateMessageRunner = NULL;
@@ -341,9 +342,10 @@ CalcView::MessageReceived(BMessage* message)
rgb_color fontColor = fExpressionTextView->HighColor(); rgb_color fontColor = fExpressionTextView->HighColor();
rgb_color backColor = fExpressionTextView->LowColor(); rgb_color backColor = fExpressionTextView->LowColor();
fExpressionTextView->SetStylable(true); fExpressionTextView->SetStylable(true);
fExpressionTextView->SetFontAndColor(start, end, NULL, 0, &backColor); fExpressionTextView->SetFontAndColor(start, end, NULL, 0,
fExpressionTextView->SetFontAndColor(start + dot - 1, start + dot, NULL, &backColor);
0, &fontColor); fExpressionTextView->SetFontAndColor(start + dot - 1,
start + dot, NULL, 0, &fontColor);
fExpressionTextView->SetStylable(false); fExpressionTextView->SetStylable(false);
} }
@@ -770,7 +772,7 @@ CalcView::Paste(BMessage* message)
BRect keypadRect(0.0, sizeDisp, fWidth, fHeight); BRect keypadRect(0.0, sizeDisp, fWidth, fHeight);
// check location of color drop // check location of color drop
if (keypadRect.Contains(dropPoint) && dropColor) { if (keypadRect.Contains(dropPoint) && dropColor != NULL) {
fBaseColor = *dropColor; fBaseColor = *dropColor;
_Colorize(); _Colorize();
// redraw // redraw
@@ -799,16 +801,20 @@ CalcView::SaveSettings(BMessage* archive) const
// record grid dimensions // record grid dimensions
if (ret == B_OK) if (ret == B_OK)
ret = archive->AddInt16("cols", fColumns); ret = archive->AddInt16("cols", fColumns);
if (ret == B_OK) if (ret == B_OK)
ret = archive->AddInt16("rows", fRows); ret = archive->AddInt16("rows", fRows);
// record color scheme // record color scheme
if (ret == B_OK) if (ret == B_OK) {
ret = archive->AddData("rgbBaseColor", B_RGB_COLOR_TYPE, ret = archive->AddData("rgbBaseColor", B_RGB_COLOR_TYPE,
&fBaseColor, sizeof(rgb_color)); &fBaseColor, sizeof(rgb_color));
if (ret == B_OK) }
if (ret == B_OK) {
ret = archive->AddData("rgbDisplay", B_RGB_COLOR_TYPE, ret = archive->AddData("rgbDisplay", B_RGB_COLOR_TYPE,
&fExpressionBGColor, sizeof(rgb_color)); &fExpressionBGColor, sizeof(rgb_color));
}
// record current options // record current options
if (ret == B_OK) if (ret == B_OK)
@@ -1081,9 +1087,8 @@ CalcView::_LoadSettings(BMessage* archive)
|| size != sizeof(rgb_color)) { || size != sizeof(rgb_color)) {
fBaseColor = ui_color(B_PANEL_BACKGROUND_COLOR); fBaseColor = ui_color(B_PANEL_BACKGROUND_COLOR);
puts("Missing rgbBaseColor from CalcView archive!\n"); puts("Missing rgbBaseColor from CalcView archive!\n");
} else { } else
fBaseColor = *color; fBaseColor = *color;
}
if (archive->FindData("rgbDisplay", B_RGB_COLOR_TYPE, if (archive->FindData("rgbDisplay", B_RGB_COLOR_TYPE,
(const void**)&color, &size) < B_OK (const void**)&color, &size) < B_OK