diff options
| author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2007-07-26 13:41:24 +0000 |
|---|---|---|
| committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2007-07-26 13:41:24 +0000 |
| commit | 3abd19af870b83175359c2e1e0af063123d14635 (patch) | |
| tree | 710d5a55d481634dfa7c08a6e99e81ffdf319272 | |
| parent | 1c2e942655c6280bc46b7a0eedefb827a7aca0ca (diff) | |
| download | fpGUI-3abd19af870b83175359c2e1e0af063123d14635.tar.xz | |
* Minor fixes with DrawControlFrame and ComboBox down button.
| -rw-r--r-- | prototypes/fpgui2/tests/edittest.lpi | 7 | ||||
| -rw-r--r-- | src/corelib/fpgfx.pas | 16 | ||||
| -rw-r--r-- | src/gui/gui_combobox.pas | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/prototypes/fpgui2/tests/edittest.lpi b/prototypes/fpgui2/tests/edittest.lpi index 1ecb384f..b609d403 100644 --- a/prototypes/fpgui2/tests/edittest.lpi +++ b/prototypes/fpgui2/tests/edittest.lpi @@ -1,7 +1,7 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> + <PathDelim Value="\"/> <Version Value="5"/> <General> <Flags> @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> + <IconPath Value=".\"/> <TargetFileExt Value=""/> </General> <VersionInfo> @@ -23,7 +23,7 @@ <RunParams> <local> <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> </RunParams> <RequiredPackages Count="1"> @@ -42,6 +42,7 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> + <PathDelim Value="\"/> <CodeGeneration> <Generate Value="Faster"/> </CodeGeneration> diff --git a/src/corelib/fpgfx.pas b/src/corelib/fpgfx.pas index a6a09c5c..8ffcc02e 100644 --- a/src/corelib/fpgfx.pas +++ b/src/corelib/fpgfx.pas @@ -832,20 +832,20 @@ end; procedure TfpgStyle.DrawControlFrame(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord); begin ACanvas.SetColor(clShadow1); - ACanvas.DrawLine(x, y, x + w - 1, y); - ACanvas.DrawLine(x, y + h - 1, x, y); + ACanvas.DrawLine(x, y, x + w - 1, y); // top (outer) + ACanvas.DrawLine(x, y + h - 1, x, y); // left (outer) ACanvas.SetColor(clShadow2); - ACanvas.DrawLine(x + 1, y + 1, x + w - 2, y + 1); - ACanvas.DrawLine(x + 1, y + h - 2, x + 1, y + 1); + ACanvas.DrawLine(x + 1, y + 1, x + w - 2, y + 1); // top (inner) + ACanvas.DrawLine(x + 1, y + h - 2, x + 1, y + 1); // left (inner) ACanvas.SetColor(clHilite2); - ACanvas.DrawLine(x + 1, y + h - 1, x + w - 1, y + h - 1); - ACanvas.DrawLine(x + w - 1, y + 1, x + w - 1, y + h - 1); + ACanvas.DrawLine(x + 1, y + h - 1, x + w, y + h - 1); // bottom (outer) + ACanvas.DrawLine(x + w - 1, y, x + w - 1, y + h); // right (outer) ACanvas.SetColor(clHilite1); - ACanvas.DrawLine(x + 2, y + h - 2, x + w - 2, y + h - 2); - ACanvas.DrawLine(x + w - 2, y + 2, x + w - 2, y + h - 2); + ACanvas.DrawLine(x + 2, y + h - 2, x + w - 2, y + h - 2); // bottom (inner) + ACanvas.DrawLine(x + w - 2, y + 1, x + w - 2, y + h - 1); // right (inner) end; procedure TfpgStyle.DrawDirectionArrow(ACanvas: TfpgCanvas; x, y, w, h: TfpgCoord; direction: integer); diff --git a/src/gui/gui_combobox.pas b/src/gui/gui_combobox.pas index 9ca2c7ef..9bbed12d 100644 --- a/src/gui/gui_combobox.pas +++ b/src/gui/gui_combobox.pas @@ -338,7 +338,7 @@ begin if not Assigned(FInternalBtn) then begin - FInternalBtn := CreateButton(self, (Width-19), 2, 18, '', @InternalBtnClick); + FInternalBtn := CreateButton(self, (Width-20), 2, 18, '', @InternalBtnClick); FInternalBtn.Height := 19; FInternalBtn.Embedded := True; FInternalBtn.Parent := self; |