diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf index bff67f10..e32d4856 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf @@ -121,7 +121,8 @@ namespace Beefy.theme.dark { g.SetFont(mFont); - DarkTheme.DrawUnderlined(g, mLabel, GS!(22), GS!(-1)); + using(g.PushColor(DarkTheme.COLOR_TEXT)) + DarkTheme.DrawUnderlined(g, mLabel, GS!(22), GS!(-1)); /*int underlinePos = mLabel.IndexOf('&'); if ((underlinePos != -1) && (underlinePos < mLabel.Length - 1)) diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf index ade3ea14..9d2a0e84 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf @@ -119,7 +119,8 @@ namespace Beefy.theme.dark g.SetFont(mFont); if (mText != null) - g.DrawString(mText, mTextInsets.mLeft, mTextInsets.mTop, FontAlign.Left, mWidth - mTextInsets.Horz, FontOverflowMode.Wrap); + using (g.PushColor(DarkTheme.COLOR_TEXT)) + g.DrawString(mText, mTextInsets.mLeft, mTextInsets.mTop, FontAlign.Left, mWidth - mTextInsets.Horz, FontOverflowMode.Wrap); } } } diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf index b2d32e3e..0854ab01 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf @@ -79,6 +79,7 @@ namespace Beefy.theme.dark mHeight = GS!(24); mHorzJumpSize = GS!(40); mFont = DarkTheme.sDarkTheme?.mSmallFont; + mTextColors[0] = DarkTheme.COLOR_TEXT; } protected override EditWidgetContent.Data CreateEditData() diff --git a/IDE/src/ui/AutoComplete.bf b/IDE/src/ui/AutoComplete.bf index cb006304..9ed9f56a 100644 --- a/IDE/src/ui/AutoComplete.bf +++ b/IDE/src/ui/AutoComplete.bf @@ -413,6 +413,11 @@ namespace IDE.ui g.PushColor(DarkTheme.COLOR_MENU_FOCUSED); defer:loop g.PopColor(); } + else + { + g.PushColor(DarkTheme.COLOR_TEXT); + defer:loop g.PopColor(); + } let str = StringView(mEntryDisplay, index, @c.NextIndex - index); diff --git a/IDE/src/ui/BinaryDataWidget.bf b/IDE/src/ui/BinaryDataWidget.bf index ee2ded1b..a038232e 100644 --- a/IDE/src/ui/BinaryDataWidget.bf +++ b/IDE/src/ui/BinaryDataWidget.bf @@ -877,7 +877,7 @@ namespace IDE.ui // column header using (g.PushClip(0, 0, mWidth, GS!(mColumnHeaderHeight))) { - using (g.PushColor(0xFFFFFFFF)) + using (g.PushColor(DarkTheme.COLOR_TEXT)) { g.SetFont(mFont); float strViewColumnStart = GS!(mColumnDisplayStart) + mBytesPerDisplayLine*GS!(mColumnDisplayStride) + GS!(mStrViewDisplayStartOffset); @@ -908,7 +908,7 @@ namespace IDE.ui float displayAdj = (float)(-mShowPositionDisplayOffset * lineSpacing); using (g.PushTranslate(0, displayAdj)) { - using (g.PushColor(0xFFFFFFFF)) + using (g.PushColor(DarkTheme.COLOR_TEXT)) { //ulong lineStart = mCurPosition / mBytesPerDisplayLine; int lockSize = lineCount * mBytesPerDisplayLine; diff --git a/IDE/src/ui/BreakpointPanel.bf b/IDE/src/ui/BreakpointPanel.bf index 567a19e6..fcd1c9dc 100644 --- a/IDE/src/ui/BreakpointPanel.bf +++ b/IDE/src/ui/BreakpointPanel.bf @@ -652,17 +652,15 @@ namespace IDE.ui subItem.mOnMouseClick.Add(new => ListViewItemClicked); } var listViewItem = (BreakpointListViewItem)root.GetChildAtIndex(breakIdx); - listViewItem.mTextColor = Color.White; + listViewItem.mTextColor = DarkTheme.COLOR_TEXT; listViewItem.mIsBold = breakpoint.IsActiveBreakpoint(); var locString = scope String(); breakpoint.ToString_Location(locString); listViewItem.Label = locString; - if (breakpoint.IsBound()) - listViewItem.mTextColor = 0xFFFFFFFF; - else - listViewItem.mTextColor = 0x80FFFFFF; + if (!breakpoint.IsBound()) + listViewItem.mTextColor = (0x00FFFFFF & DarkTheme.COLOR_TEXT) | 0x80000000; // Condition var subItem = listViewItem.GetSubItem(2); diff --git a/IDE/src/ui/ConditionDialog.bf b/IDE/src/ui/ConditionDialog.bf index efd13222..db810cfd 100644 --- a/IDE/src/ui/ConditionDialog.bf +++ b/IDE/src/ui/ConditionDialog.bf @@ -369,14 +369,17 @@ namespace IDE.ui { base.Draw(g); - g.DrawString("Breakpoint Condition", mConditionEdit.mX, mConditionEdit.mY - GS!(20)); - g.DrawString("Thread Id", mThreadEdit.mX, mThreadEdit.mY - GS!(20)); - g.DrawString("Log String", mLogEdit.mX, mLogEdit.mY - GS!(20)); - g.DrawString("Break on Hit Count", mHitCountCombo.mX, mHitCountEdit.mY - GS!(19)); + using (g.PushColor(DarkTheme.COLOR_TEXT)) + { + g.DrawString("Breakpoint Condition", mConditionEdit.mX, mConditionEdit.mY - GS!(20)); + g.DrawString("Thread Id", mThreadEdit.mX, mThreadEdit.mY - GS!(20)); + g.DrawString("Log String", mLogEdit.mX, mLogEdit.mY - GS!(20)); + g.DrawString("Break on Hit Count", mHitCountCombo.mX, mHitCountEdit.mY - GS!(19)); - var str = scope String(); - str.AppendF("Current: {0}", mStartingHitCount); - g.DrawString(str, mWidth - GS!(16) - GS!(8), mHitCountEdit.mY - GS!(19), .Right); + var str = scope String(); + str.AppendF("Current: {0}", mStartingHitCount); + g.DrawString(str, mWidth - GS!(16) - GS!(8), mHitCountEdit.mY - GS!(19), .Right); + } } } } diff --git a/IDE/src/ui/FindAndReplaceDialog.bf b/IDE/src/ui/FindAndReplaceDialog.bf index cea5fff6..a571ed62 100644 --- a/IDE/src/ui/FindAndReplaceDialog.bf +++ b/IDE/src/ui/FindAndReplaceDialog.bf @@ -322,11 +322,14 @@ namespace IDE.ui { base.Draw(g); - g.DrawString("Find what:", 6, mEditWidget.mY - GS!(18)); - if (mReplaceWidget != null) - g.DrawString("Replace with:", GS!(6), mReplaceWidget.mY - GS!(18)); - g.DrawString("Look in:", GS!(6), mLocationCombo.mY - GS!(18)); - g.DrawString("Look at these file types:", GS!(6), mFileTypesCombo.mY - GS!(18)); + using (g.PushColor(DarkTheme.COLOR_TEXT)) + { + g.DrawString("Find what:", 6, mEditWidget.mY - GS!(18)); + if (mReplaceWidget != null) + g.DrawString("Replace with:", GS!(6), mReplaceWidget.mY - GS!(18)); + g.DrawString("Look in:", GS!(6), mLocationCombo.mY - GS!(18)); + g.DrawString("Look at these file types:", GS!(6), mFileTypesCombo.mY - GS!(18)); + } } public override void Update() diff --git a/IDE/src/ui/NewBreakpointDialog.bf b/IDE/src/ui/NewBreakpointDialog.bf index 812bc978..b66d895e 100644 --- a/IDE/src/ui/NewBreakpointDialog.bf +++ b/IDE/src/ui/NewBreakpointDialog.bf @@ -140,7 +140,8 @@ namespace IDE.ui { base.Draw(g); - g.DrawString((mBreakpointKind == .Memory) ? "Breakpoint Address" : "Symbol Name", mAddressEdit.mX, mAddressEdit.mY - GS!(20)); + using (g.PushColor(DarkTheme.COLOR_TEXT)) + g.DrawString((mBreakpointKind == .Memory) ? "Breakpoint Address" : "Symbol Name", mAddressEdit.mX, mAddressEdit.mY - GS!(20)); //g.DrawString("Project Directory", mDialogEditWidget.mX, mDialogEditWidget.mY - 20); } diff --git a/IDE/src/ui/SourceViewPanel.bf b/IDE/src/ui/SourceViewPanel.bf index cfdcd3ae..2b9ea18d 100644 --- a/IDE/src/ui/SourceViewPanel.bf +++ b/IDE/src/ui/SourceViewPanel.bf @@ -4746,7 +4746,8 @@ namespace IDE.ui case 2: lineStr.AppendF("{0}", (lineIdx + 1) % 100); default: lineStr.AppendF("{0}", lineIdx + 1); } - g.DrawString(lineStr, 0, GS!(2) + ewc.mLineCoords[lineIdx], FontAlign.Right, editX - GS!(14)); + using (g.PushColor(DarkTheme.COLOR_TEXT)) + g.DrawString(lineStr, 0, GS!(2) + ewc.mLineCoords[lineIdx], FontAlign.Right, editX - GS!(14)); } } } diff --git a/IDE/src/ui/StartupPanel.bf b/IDE/src/ui/StartupPanel.bf index ca6822c4..adfbfbb2 100644 --- a/IDE/src/ui/StartupPanel.bf +++ b/IDE/src/ui/StartupPanel.bf @@ -92,7 +92,8 @@ namespace IDE.ui } g.SetFont(s_Font); - g.DrawString(mPath, 10, 0, .Left, mWidth - 10); + using (g.PushColor(gApp.mSettings.mUISettings.mColors.mText)) + g.DrawString(mPath, 10, 0, .Left, mWidth - 10); } public override void MouseEnter()