Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for overlapping SideTitles #1033

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

Fix for overlapping SideTitles #1033

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
857653f
https://github.com/imaNNeoFighT/fl_chart/issues/1032
RobinJespersen May 25, 2022
56ce888
renaming reservedSize to reservedHeight
RobinJespersen Jul 2, 2022
28296ea
if horizontal, use reservedWidth, else reservedHeight
RobinJespersen Jul 2, 2022
222d36a
updated container size definition
RobinJespersen Jul 2, 2022
f85e287
stretch titles in main axis
RobinJespersen Jul 2, 2022
6233e5d
updated examples
RobinJespersen Jul 2, 2022
4ce1629
updated tests
RobinJespersen Jul 2, 2022
644f811
updated tests
RobinJespersen Jul 2, 2022
8790b79
either reservedWidth or reservedHeight must not be null
RobinJespersen Jul 2, 2022
e347809
updated extension
RobinJespersen Jul 2, 2022
116a5bc
Merge branch 'master' into master
RobinJespersen Jul 2, 2022
a314ead
updated changelog
RobinJespersen Jul 2, 2022
fbeab51
fixed RangeError
RobinJespersen Jul 13, 2022
d1621ea
Merge branch 'master' into master
RobinJespersen Aug 3, 2022
9e97ab3
Merge remote-tracking branch 'upstream/master' into pr/RobinJespersen…
RobinJespersen May 12, 2023
0b1acc3
clean up
RobinJespersen May 12, 2023
8c5465d
fixed merge
RobinJespersen May 12, 2023
0caec5b
fixed merge
RobinJespersen May 12, 2023
36bef79
fixed samples
RobinJespersen May 12, 2023
da0ec62
cleanup
RobinJespersen May 12, 2023
61b2c59
cleanup
RobinJespersen May 12, 2023
3a97305
cleanup
RobinJespersen May 12, 2023
b4947be
cleanup
RobinJespersen May 12, 2023
6a3769a
cleanup
RobinJespersen May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## newVersion
* **BUGFIX** (by @ateich): Fix infinite loop in RadarChart when all values in RadarDataSet are equal, #882.
* **BUGFIX** (by @ateich): Fix uneven titles in RadarChart when using titlePositionPercentageOffset, #1074.
* **BUGFIX** (by @RobinJespersen) Added SideTiles reservedWidth to avoid overlapping SideTitles #1033
* **BREAKING** (by @RobinJespersen) Renamed SideTitles reservedSize to reservedHeight

## 0.55.0
* **FEATURE** (by @emelinepal): Add `tooltipBorder` property in [LineTouchTooltipData], [BarTouchTooltipData], [ScatterTouchTooltipData], #692.
Expand Down
4 changes: 2 additions & 2 deletions example/lib/bar_chart/samples/bar_chart_sample1.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ class BarChartSample1State extends State<BarChartSample1> {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: getTitles,
reservedSize: 38,
reservedHeight: 38,
),
),
leftTitles: AxisTitles(
Expand Down Expand Up @@ -298,7 +298,7 @@ class BarChartSample1State extends State<BarChartSample1> {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: getTitles,
reservedSize: 38,
reservedHeight: 38,
),
),
leftTitles: AxisTitles(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/bar_chart/samples/bar_chart_sample2.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ class BarChartSample2State extends State<BarChartSample2> {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: bottomTitles,
reservedSize: 42,
reservedHeight: 42,
),
),
leftTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 28,
reservedWidth: 28,
interval: 1,
getTitlesWidget: leftTitles,
),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/bar_chart/samples/bar_chart_sample3.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class _BarChart extends StatelessWidget {
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 30,
reservedHeight: 30,
getTitlesWidget: getTitles,
),
),
Expand Down
4 changes: 2 additions & 2 deletions example/lib/bar_chart/samples/bar_chart_sample4.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ class BarChartSample4State extends State<BarChartSample4> {
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 28,
reservedHeight: 28,
getTitlesWidget: bottomTitles,
),
),
leftTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 40,
reservedWidth: 40,
getTitlesWidget: leftTitles,
),
),
Expand Down
8 changes: 4 additions & 4 deletions example/lib/bar_chart/samples/bar_chart_sample5.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,14 @@ class BarChartSample5State extends State<BarChartSample5> {
topTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 32,
reservedHeight: 32,
getTitlesWidget: topTitles,
),
),
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 32,
reservedHeight: 32,
getTitlesWidget: bottomTitles,
),
),
Expand All @@ -309,15 +309,15 @@ class BarChartSample5State extends State<BarChartSample5> {
showTitles: true,
getTitlesWidget: leftTitles,
interval: 5,
reservedSize: 42,
reservedWidth: 42,
),
),
rightTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: rightTitles,
interval: 5,
reservedSize: 42,
reservedWidth: 42,
),
),
),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/bar_chart/samples/bar_chart_sample6.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class BarChartSample6 extends StatelessWidget {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: bottomTitles,
reservedSize: 16,
reservedHeight: 16,
),
),
),
Expand Down
4 changes: 2 additions & 2 deletions example/lib/bar_chart/samples/bar_chart_sample7.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class _BarChartSample7State extends State<BarChartSample7> {
drawBehindEverything: true,
sideTitles: SideTitles(
showTitles: true,
reservedSize: 30,
reservedWidth: 30,
getTitlesWidget: (value, meta) {
return Text(
value.toInt().toString(),
Expand All @@ -91,7 +91,7 @@ class _BarChartSample7State extends State<BarChartSample7> {
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 36,
reservedHeight: 36,
getTitlesWidget: (value, meta) {
final index = value.toInt();
return SideTitleWidget(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/line_chart/samples/line_chart_sample1.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class _LineChart extends StatelessWidget {
getTitlesWidget: leftTitleWidgets,
showTitles: true,
interval: 1,
reservedSize: 40,
reservedWidth: 40,
);

Widget bottomTitleWidgets(double value, TitleMeta meta) {
Expand Down Expand Up @@ -159,7 +159,7 @@ class _LineChart extends StatelessWidget {

SideTitles get bottomTitles => SideTitles(
showTitles: true,
reservedSize: 32,
reservedHeight: 32,
interval: 1,
getTitlesWidget: bottomTitleWidgets,
);
Expand Down
8 changes: 4 additions & 4 deletions example/lib/line_chart/samples/line_chart_sample2.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class _LineChartSample2State extends State<LineChartSample2> {
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 30,
reservedHeight: 30,
interval: 1,
getTitlesWidget: bottomTitleWidgets,
),
Expand All @@ -153,7 +153,7 @@ class _LineChartSample2State extends State<LineChartSample2> {
showTitles: true,
interval: 1,
getTitlesWidget: leftTitleWidgets,
reservedSize: 42,
reservedWidth: 42,
),
),
),
Expand Down Expand Up @@ -227,7 +227,7 @@ class _LineChartSample2State extends State<LineChartSample2> {
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 30,
reservedHeight: 30,
getTitlesWidget: bottomTitleWidgets,
interval: 1,
),
Expand All @@ -236,7 +236,7 @@ class _LineChartSample2State extends State<LineChartSample2> {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: leftTitleWidgets,
reservedSize: 42,
reservedWidth: 42,
interval: 1,
),
),
Expand Down
4 changes: 2 additions & 2 deletions example/lib/line_chart/samples/line_chart_sample3.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,14 +318,14 @@ class _LineChartSample3State extends State<LineChartSample3> {
leftTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 46,
reservedWidth: 46,
getTitlesWidget: leftTitleWidgets,
),
),
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 40,
reservedHeight: 40,
getTitlesWidget: bottomTitleWidgets,
),
),
Expand Down
4 changes: 2 additions & 2 deletions example/lib/line_chart/samples/line_chart_sample4.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class LineChartSample4 extends StatelessWidget {
),
sideTitles: SideTitles(
showTitles: true,
reservedSize: 18,
reservedHeight: 18,
interval: 1,
getTitlesWidget: bottomTitleWidgets,
),
Expand All @@ -145,7 +145,7 @@ class LineChartSample4 extends StatelessWidget {
sideTitles: SideTitles(
showTitles: true,
interval: 1,
reservedSize: 40,
reservedWidth: 40,
getTitlesWidget: leftTitleWidgets,
),
),
Expand Down
6 changes: 3 additions & 3 deletions example/lib/line_chart/samples/line_chart_sample5.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class LineChartSample5 extends StatelessWidget {
axisNameWidget: const Text('count'),
sideTitles: SideTitles(
showTitles: false,
reservedSize: 0,
reservedWidth: 0,
),
),
bottomTitles: AxisTitles(
Expand All @@ -167,7 +167,7 @@ class LineChartSample5 extends StatelessWidget {
axisNameWidget: const Text('count'),
sideTitles: SideTitles(
showTitles: false,
reservedSize: 0,
reservedWidth: 0,
),
),
topTitles: AxisTitles(
Expand All @@ -177,7 +177,7 @@ class LineChartSample5 extends StatelessWidget {
),
sideTitles: SideTitles(
showTitles: true,
reservedSize: 0,
reservedHeight: 0,
),
),
),
Expand Down
6 changes: 3 additions & 3 deletions example/lib/line_chart/samples/line_chart_sample6.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,22 +179,22 @@ class LineChartSample6 extends StatelessWidget {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: leftTitleWidgets,
reservedSize: 38,
reservedWidth: 38,
),
),
rightTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: rightTitleWidgets,
reservedSize: 30),
reservedWidth: 30),
),
bottomTitles: AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
topTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 32,
reservedHeight: 32,
getTitlesWidget: topTitleWidgets,
),
),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/line_chart/samples/line_chart_sample7.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class LineChartSample7 extends StatelessWidget {
showTitles: true,
getTitlesWidget: leftTitleWidgets,
interval: 1,
reservedSize: 36,
reservedWidth: 36,
),
),
topTitles: AxisTitles(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/line_chart/samples/line_chart_sample8.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class _LineChartSample8State extends State<LineChartSample8> {
bottomTitles: AxisTitles(
sideTitles: SideTitles(
showTitles: true,
reservedSize: 30,
reservedHeight: 30,
getTitlesWidget: bottomTitleWidgets,
interval: 4,
),
Expand All @@ -189,7 +189,7 @@ class _LineChartSample8State extends State<LineChartSample8> {
interval: 2,
showTitles: true,
getTitlesWidget: leftTitleWidgets,
reservedSize: 40,
reservedWidth: 40,
),
),
rightTitles: AxisTitles(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/line_chart/samples/line_chart_sample9.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class LineChartSample9 extends StatelessWidget {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: leftTitleWidgets,
reservedSize: 56,
reservedWidth: 56,
),
),
rightTitles: AxisTitles(
Expand All @@ -95,7 +95,7 @@ class LineChartSample9 extends StatelessWidget {
sideTitles: SideTitles(
showTitles: true,
getTitlesWidget: bottomTitleWidgets,
reservedSize: 36,
reservedHeight: 36,
),
),
topTitles: AxisTitles(
Expand Down