From d967c1a3b2b764a11591a885c773d9bc11a01297 Mon Sep 17 00:00:00 2001
From: Septen <gammerxpower@gmail.com>
Date: Fri, 17 Jun 2016 09:58:54 +0400
Subject: [PATCH] Button managers: some bug fixes and remove redundant include
statements.
---
Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h | 1 -
Source/UI/Utils/LinearButtonGroupManager.cpp | 4 +++-
Source/UI/Utils/LinearButtonGroupManager.h | 3 +--
Source/UI/Utils/TiledButtonGroupManager.h | 3 ---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h b/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h
index ee04e4bc9..1b400befe 100644
--- a/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h
+++ b/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h
@@ -26,7 +26,6 @@
#include "../../../JuceLibraryCode/JuceHeader.h"
#include "../../Processors/PluginManager/OpenEphysPlugin.h"
-#include "CustomLookAndFeel.h"
/**
diff --git a/Source/UI/Utils/LinearButtonGroupManager.cpp b/Source/UI/Utils/LinearButtonGroupManager.cpp
index 8c4488b3d..a132623ce 100644
--- a/Source/UI/Utils/LinearButtonGroupManager.cpp
+++ b/Source/UI/Utils/LinearButtonGroupManager.cpp
@@ -88,7 +88,9 @@ void LinearButtonGroupManager::resized()
const int height = getHeight();
const int numButtons = m_buttons.size();
- const int buttonWidth = width / numButtons;
+ const int buttonWidth = numButtons != 0
+ ? width / numButtons
+ : 0;
// Set bounds for each button
juce::Rectangle<int> buttonBounds (0, 0, buttonWidth, height);
diff --git a/Source/UI/Utils/LinearButtonGroupManager.h b/Source/UI/Utils/LinearButtonGroupManager.h
index a35bf62b9..4e6af5c84 100644
--- a/Source/UI/Utils/LinearButtonGroupManager.h
+++ b/Source/UI/Utils/LinearButtonGroupManager.h
@@ -24,10 +24,9 @@
#ifndef LINEARBUTTONGROUPMANAGER_H_INCLUDED
#define LINEARBUTTONGROUPMANAGER_H_INCLUDED
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
#include "ButtonGroupManager.h"
+
/**
This class provides possibility to store buttons with radiobutton behaviour in the single
diff --git a/Source/UI/Utils/TiledButtonGroupManager.h b/Source/UI/Utils/TiledButtonGroupManager.h
index d1f1fa17d..4286db4a2 100644
--- a/Source/UI/Utils/TiledButtonGroupManager.h
+++ b/Source/UI/Utils/TiledButtonGroupManager.h
@@ -24,7 +24,6 @@
#ifndef TILEDBUTTONGROUPMANAGER_H_INCLUDED
#define TILEDBUTTONGROUPMANAGER_H_INCLUDED
-#include "../../../JuceLibraryCode/JuceHeader.h"
#include "../../Processors/PluginManager/OpenEphysPlugin.h"
#include "ButtonGroupManager.h"
@@ -37,8 +36,6 @@
using mouse drag selection. (mouse drag - to select, shift+mouse drag to deselect)
*/
-
-
class PLUGIN_API TiledButtonGroupManager : public ButtonGroupManager
{
public:
--
GitLab