github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-29 06:06:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

TabBar: Mr. Ped fixes (GCC warnings and missing *this)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2964 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
unodgs 2011-01-06 23:46:14 +00:00
parent 40996a493a
commit 95cb3db698
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/TabBar/TabBar.cpp
View file

@ -914,7 +914,6 @@ void TabBar::PaintTab(Draw &w, const Size &sz, int n, bool enable, bool dragsamp
const Style& s = GetStyle();
int align = GetAlign();
int cnt = dragsample ? 1 : tabs.GetCount();
int sep = TB_SBSEPARATOR * sc.IsVisible();
bool ac = (n == active && enable);
bool hl = (n == highlight && enable) || (stacking && highlight >= 0 && tabs[highlight].stack == t.stack);

8
uppsrc/TabBar/TabBar.h
View file

@ -25,7 +25,7 @@ public:
BOTTOM = 3
};
AlignedFrame() : border(0), framesize(0), layout(TOP) {}
AlignedFrame() : layout(TOP), framesize(0), border(0) {}
virtual void FrameAddSize(Size& sz);
virtual void FramePaint(Draw& w, const Rect& r);
@ -176,7 +176,7 @@ public:
Vector<TabItem> items;
Tab() : visible(true), id(-1), stack(-1) { }
Tab() : id(-1), stack(-1), visible(true) { }
Tab(const Tab& t) { Set(t); }
void Set(const Tab& t);
@ -435,10 +435,10 @@ public:
bool IsStacking() const { return stacking; }
bool IsShowInactive() const { return inactivedisabled; }
TabBar& NeverEmpty() { MinTabCount(1); }
TabBar& NeverEmpty() { return MinTabCount(1); }
TabBar& MinTabCount(int cnt) { mintabcount = max(cnt, 0); Refresh(); return *this; }
TabBar& SetDisplay(const Display& d) { display =& d; Refresh(); }
TabBar& SetDisplay(const Display& d) { display =& d; Refresh(); return *this; }
TabBar& SetBorder(int border) { AlignedFrame::SetBorder(border); return *this; }
int FindKey(const Value& v) const;
int FindValue(const Value& v) const;