Skip to content
Snippets Groups Projects
Commit 48cddaea authored by jsiegle's avatar jsiegle
Browse files

Removed custom tab drawing

parent 61328369
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Source/UI/CustomLookAndFeel.cpp
+ 0
− 199
View file @ 48cddaea
......@@ -134,205 +134,6 @@ const Typeface::Ptr CustomLookAndFeel::getTypefaceForFont (const Font& font)
// return LookAndFeel::getTypefaceForFont(font);
}
//==============================================================================
// TAB METHODS :
//==============================================================================
int CustomLookAndFeel::getTabButtonOverlap (int tabDepth)
{
return 0; //1 + tabDepth / 4;
}
int CustomLookAndFeel::getTabButtonSpaceAroundImage()
{
return 6;
}
void CustomLookAndFeel::drawTabButton(TabBarButton& tbb, Graphics& g, bool isMouseOver, bool isMouseDown)
{
// Rectangle<int> area = tbb.getActiveArea();
// int length = area.getWidth();
// int depth = area.getHeight();
// int x = width;
// int y = height;
// int orientation = TabbedButtonBar::TabsAtRight;
// if (orientation == TabbedButtonBar::TabsAtLeft
// || orientation == TabbedButtonBar::TabsAtRight)
// {
// swapVariables (length, depth);
// }
// int borderSize = 3; // border between adjacent tabs
// // int innerBorderSize = 3;
// int gapSize = 6; // gap between tab and tabbedComponent
// float cornerSize = 5.0f; // how rounded should the corners be?
// g.setColour(Colour(48,48,48));
// if (orientation == TabbedButtonBar::TabsAtRight)
// {
// g.fillRoundedRectangle(gapSize, borderSize, w-gapSize, h-2*borderSize, cornerSize-2.0);
// if (isFrontTab) {
// g.setColour(Colour(48,48,48));
// g.fillRect(0,borderSize,gapSize*2,h-2*borderSize);
// g.fillRect(0,0,gapSize,h);
// //g.setColour(Colour(170,178,183));
// //g.fillRect(borderSize+innerBorderSize,innerBorderSize
// // ,w-2*borderSize-2*innerBorderSize,h-gapSize-2*innerBorderSize);
// g.setColour(Colour(0, 0, 0));
// g.fillRoundedRectangle(0,h-borderSize,w,2*borderSize,cornerSize);
// g.fillRoundedRectangle(0,-borderSize,w,2*borderSize,cornerSize);
// }
// }
// else if (orientation == TabbedButtonBar::TabsAtTop)
// {
// g.fillRoundedRectangle(borderSize,0,w-2*borderSize,h-gapSize,cornerSize-2.0);
// //g.setColour(Colour(170,178,183));
// //g.fillRect(borderSize+innerBorderSize,innerBorderSize
// // ,w-2*borderSize-2*innerBorderSize,h-gapSize-2*innerBorderSize);
// if (isFrontTab) {
// g.setColour(Colour(103,116,140));
// g.fillRect(borderSize,h-2*gapSize,w-2*borderSize,2*gapSize);
// g.fillRect(0,h-gapSize,w,gapSize);
// //g.setColour(Colour(170,178,183));
// //g.fillRect(borderSize+innerBorderSize,innerBorderSize
// // ,w-2*borderSize-2*innerBorderSize,h-gapSize-2*innerBorderSize);
// g.setColour(Colour(0,0,0));
// g.fillRoundedRectangle(-borderSize,0,2*borderSize,h,cornerSize);
// g.fillRoundedRectangle(w-borderSize,0,2*borderSize,h,cornerSize);
// }
// }
// else if (orientation == TabbedButtonBar::TabsAtBottom)
// {
// g.fillRoundedRectangle(5,5,w-5,h-5,5);
// if (isFrontTab)
// g.fillRect(5,10,w-5,20);
// }
// else if (orientation == TabbedButtonBar::TabsAtLeft)
// {
// g.fillRoundedRectangle(5,5,w-5,h-5,5);
// if (isFrontTab)
// g.fillRect(5,10,w-5,20);
// }
// const int indent = getTabButtonOverlap (depth);
// int x = 0, y = 0;
// if (orientation == TabbedButtonBar::TabsAtLeft
// || orientation == TabbedButtonBar::TabsAtRight)
// {
// y += indent;
// h -= indent * 2;
// }
// else
// {
// x += indent;
// w -= indent * 2;
// }
// drawTabButtonText (g, x, y, w, h, preferredColour,
// tabIndex, text, button, orientation,
// isMouseOver, isMouseDown, isFrontTab);
}
void CustomLookAndFeel::drawTabButtonText(TabBarButton& tbb, Graphics& g, bool isMouseOver, bool isMouseDown)
{
// Rectangle<int> area = tbb.getActiveArea();
// int length = area.getWidth();
// int depth = area.getHeight();
// int x = width;
// int y = height;
// int orientation = TabbedButtonBar::TabsAtRight;
// if (orientation == TabbedButtonBar::TabsAtLeft
// || orientation == TabbedButtonBar::TabsAtRight)
// {
// swapVariables (length, depth);
// }
// Font font (depth * 0.6f);
// font.setUnderline (tbb.hasKeyboardFocus (false));
// GlyphArrangement textLayout;
// textLayout.addFittedText (font, tbb.name.trim(),
// 0.0f, 0.0f, (float) length, (float) depth,
// Justification::centred,
// jmax (1, depth / 12));
// AffineTransform transform;
// if (orientation == TabbedButtonBar::TabsAtLeft)
// {
// transform = transform.rotated (float_Pi * -0.5f)
// .translated ((float) x, (float) (y + h));
// }
// else if (orientation == TabbedButtonBar::TabsAtRight)
// {
// transform = transform.rotated (float_Pi * 0.5f)
// .translated ((float) (x + w*1.1), (float) y);
// }
// else if (orientation == TabbedButtonBar::TabsAtTop)
// {
// transform = transform.translated ((float) x, (float) y - 3.0f);
// }
// else
// {
// transform = transform.translated ((float) x, (float) y + 3.0f);
// }
// // if (isFrontTab && (button.isColourSpecified (TabbedButtonBar::frontTextColourId) || isColourSpecified (TabbedButtonBar::frontTextColourId)))
// // g.setColour (findColour (TabbedButtonBar::frontTextColourId));
// // else if (button.isColourSpecified (TabbedButtonBar::tabTextColourId) || isColourSpecified (TabbedButtonBar::tabTextColourId))
// // g.setColour (findColour (TabbedButtonBar::tabTextColourId));
// // else
// // g.setColour (preferredBackgroundColour.contrasting());
// g.setColour(Colour(255,255,255));
// if (! (isMouseOver || isMouseDown))
// g.setOpacity (0.8f);
// if (! button.isEnabled())
// g.setOpacity (0.3f);
// textLayout.draw (g, transform);
}
int CustomLookAndFeel::getTabButtonBestWidth(TabBarButton& tbb, int tabDepth)
{
//Font f (tabDepth * 0.6f);
return 10; //f.getStringWidth (tbb.name.trim()) + getTabButtonOverlap (tabDepth) * 2 + 40;
}
void CustomLookAndFeel::drawTabAreaBehindFrontButton(TabbedButtonBar& tbb, Graphics& g, int w, int h)
{
}
//==================================================================
// SCROLL BAR METHODS :
//==================================================================
......
Source/UI/CustomLookAndFeel.h
+ 0
− 46
View file @ 48cddaea
......@@ -49,52 +49,6 @@ public:
// ======== custom typeface getter: =============================
const Typeface::Ptr getTypefaceForFont (const Font& font);
// ======== custom tab methods: =============================
// int drawTabButton (Graphics & g,
// int w, int h,
// const Colour& preferredColour,
// int tabIndex, const String& text,
// Button& button,
// TabbedButtonBar::Orientation,
// bool isMouseOver,
// bool isMouseDown,
// bool isFrontTab);
void drawTabButton(TabBarButton& tbb, Graphics& g, bool isMouseOver, bool isMouseDown);
// int drawTabButtonText (Graphics& g,
// int x, int y, int w, int h,
// const Colour& preferredBackgroundColour,
// int tabIndex,
// const String& text,
// Button& button,
// TabbedButtonBar::Orientation o,
// bool isMouseOver,
// bool isMouseDown,
// bool isFrontTab);
void drawTabButtonText(TabBarButton& tbb, Graphics& g, bool isMouseOver, bool isMouseDown);
// int getTabButtonBestWidth (int tabIndex,
// const String& text,
// int tabDepth,
// Button& button);
int getTabButtonBestWidth(TabBarButton& tbb, int tabDepth);
int getTabButtonSpaceAroundImage ();
// int drawTabAreaBehindFrontButton (Graphics& g,
// int w, int h,
// TabbedButtonBar& tabBar,
// TabbedButtonBar::Orientation o);
void drawTabAreaBehindFrontButton(TabbedButtonBar& tbb, Graphics& g, int w, int h);
int getTabButtonOverlap (int tabDepth);
// ======== custom scroll bar methods: =============================
void drawScrollbarButton (Graphics& g,
......
Source/UI/DataViewport.cpp
+ 4
− 0
View file @ 48cddaea
......@@ -41,6 +41,8 @@ DataViewport::DataViewport() :
setColour(TabbedComponent::backgroundColourId,
Colours::darkgrey);
}
DataViewport::~DataViewport()
......@@ -57,6 +59,8 @@ DataViewport::~DataViewport()
addTab(name, Colours::lightgrey, component, false, tabIndex);
getTabbedButtonBar().setCurrentTabIndex(tabIndex);
getTabbedButtonBar().setTabBackgroundColour(tabIndex, Colours::darkgrey);
setOutline(0);
tabArray.add(tabIndex);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment