From dc36d9ae9b4f7e737000acc7298ab3fed9ee7ce4 Mon Sep 17 00:00:00 2001 From: "Jean-Marc.Levecque" Date: Mon, 13 Oct 2014 15:55:52 +0200 Subject: Make the selected text in editcombo follow the theme color Signed-off-by: Jean-Marc.Levecque --- src/gui/fpg_editcombo.pas | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui/fpg_editcombo.pas') diff --git a/src/gui/fpg_editcombo.pas b/src/gui/fpg_editcombo.pas index 5b011b4d..62ca79d2 100644 --- a/src/gui/fpg_editcombo.pas +++ b/src/gui/fpg_editcombo.pas @@ -734,17 +734,17 @@ var // paint selection rectangle procedure DrawSelection; var - lcolor: TfpgColor; + lcolor,ltxtcolor: TfpgColor; begin if Focused then begin lcolor := clSelection; - Canvas.SetTextColor(clSelectionText); + ltxtcolor := clSelectionText; end else begin lcolor := clInactiveSel; - Canvas.SetTextColor(clText1); + ltxtcolor := clText1; end; len := FSelOffset; @@ -759,16 +759,16 @@ var // XOR on Anti-aliased text doesn't look to good. Lets try standard // Blue & White like what was doen in TfpgEdit. -{ Canvas.SetColor(lcolor); + Canvas.SetColor(lcolor); Canvas.FillRectangle(-FDrawOffset + FMargin + tw, 3, tw2 - tw, Font.Height); r.SetRect(-FDrawOffset + FMargin + tw, 3, tw2 - tw, Font.Height); Canvas.AddClipRect(r); - Canvas.SetTextColor(clWhite); - fpgStyle.DrawString(Canvas, -FDrawOffset + FMargin, 3, Text, Enabled); + Canvas.SetTextColor(ltxtcolor); + fpgStyle.DrawString(Canvas, -FDrawOffset + FMargin + tw, 3, UTF8Copy(Items[FSelectedItem], Succ(st), Pred(len)), Enabled); Canvas.ClearClipRect; -} - Canvas.XORFillRectangle(fpgColorToRGB(lcolor) xor $FFFFFF, - -FDrawOffset + FMargin + tw, 3, tw2 - tw, Font.Height); + + //Canvas.XORFillRectangle(fpgColorToRGB(lcolor) xor $FFFFFF, + // -FDrawOffset + FMargin + tw, 3, tw2 - tw, Font.Height); end; begin -- cgit v1.2.3-70-g09d2 From fed96e57afaf388a57c7bdf7944f218e6e5a4c93 Mon Sep 17 00:00:00 2001 From: "Jean-Marc.Levecque" Date: Thu, 18 Dec 2014 00:02:16 +0100 Subject: Fix bug in InternalListBoxSelect Signed-off-by: Jean-Marc.Levecque --- src/gui/fpg_editcombo.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/fpg_editcombo.pas') diff --git a/src/gui/fpg_editcombo.pas b/src/gui/fpg_editcombo.pas index 62ca79d2..12773d9b 100644 --- a/src/gui/fpg_editcombo.pas +++ b/src/gui/fpg_editcombo.pas @@ -367,7 +367,7 @@ begin begin if Items[i]= TDropDownWindow(FDropDown).ListBox.Items[TDropDownWindow(FDropDown).ListBox.FocusItem] then begin - FocusItem := i; + FNewItem := False; FSelectedItem:= i; FText:= Items[i]; Break; -- cgit v1.2.3-70-g09d2