From 7d0d4a6821644a73fc52b54eba6774ba5a64cb54 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= jaakko.keranen@iki.fi

Date: Sat, 31 Oct 2020 07:43:49 +0200

Subject: [PATCH 1/1] Preferences: Changed apperance of tabs

src/ui/util.c | 6 +++++-

src/ui/widget.c | 6 ++++++

src/ui/widget.h | 1 +

3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/ui/util.c b/src/ui/util.c

index 3c40d4a5..44f7e089 100644

--- a/src/ui/util.c

+++ b/src/ui/util.c

@@ -924,7 +924,7 @@ static iWidget *appendTwoColumnPage_(iWidget *tabs, const char *title, int short

                                  iWidget **values) {

 iWidget *page = new_Widget();

 setFlags_Widget(page, arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |

•                resizeHeightOfChildren_WidgetFlag, iTrue);
  

•                resizeHeightOfChildren_WidgetFlag | borderTop_WidgetFlag, iTrue);
  

 addChildFlags_Widget(page, iClob(new_Widget()), expand_WidgetFlag);

 iWidget *columns = new_Widget();

 addChildFlags_Widget(page, iClob(columns), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);

@@ -934,6 +934,10 @@ static iWidget *appendTwoColumnPage_(iWidget *tabs, const char *title, int short

     columns, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);

 addChildFlags_Widget(page, iClob(new_Widget()), expand_WidgetFlag);

 appendTabPage_Widget(tabs, page, title, shortcut, shortcut ? KMOD_PRIMARY : 0);

• setFlags_Widget(

•    (iWidget *) back_ObjectList(children_Widget(findChild_Widget(tabs, "tabs.buttons"))),
  

•    frameless_WidgetFlag,
  

•    iTrue);
  

 return page;

}

diff --git a/src/ui/widget.c b/src/ui/widget.c

index d10d73e1..d8c2c421 100644

--- a/src/ui/widget.c

+++ b/src/ui/widget.c

@@ -599,6 +599,12 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {

void drawBackground_Widget(const iWidget *d) {

 if (d->flags & hidden_WidgetFlag) return;

• if (flags_Widget(d) & borderTop_WidgetFlag) {

•    const iRect rect = bounds_Widget(d);
  

•    iPaint p;
  

•    init_Paint(&p);
  

•    drawHLine_Paint(&p, topLeft_Rect(rect), width_Rect(rect), uiBackgroundFramelessHover_ColorId);
  

• }

 if (d->bgColor >= 0 || d->frameColor >= 0) {

     const iRect rect = bounds_Widget(d);

     iPaint p;

diff --git a/src/ui/widget.h b/src/ui/widget.h

index fd7ee316..f5e255f2 100644

--- a/src/ui/widget.h

+++ b/src/ui/widget.h

@@ -87,6 +87,7 @@ enum iWidgetFlag {

#define centerHorizontal_WidgetFlag iBit64(33)

#define moveToParentRightEdge_WidgetFlag iBit64(34)

#define wrapText_WidgetFlag iBit64(35)

+#define borderTop_WidgetFlag iBit64(36)

enum iWidgetAddPos {

 back_WidgetAddPos,

--

2.25.1