WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

tooltip updated in workspace #37

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

Merged
TeeWrath merged 2 commits into from
Sep 8, 2025
Merged

tooltip updated in workspace #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c15a9ee
tooltip upgraded in workspace
swarno-tech Sep 8, 2025
0734a2d
Merge branch 'CookethOrg:rewrite' into rewrite
swarno-tech Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions lib/features/workspace/widgets/toolbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ToolBar extends StatelessWidget {
),
child:
device == rh.DeviceType.mobile
? FittedBox(
? FittedBox(
fit: BoxFit.scaleDown,
child: Row(
mainAxisSize: MainAxisSize.min,
Expand All @@ -61,7 +61,7 @@ class ToolBar extends StatelessWidget {
context,
provider,
device,
suprovider
suprovider,
); // Pass the provider
},
backgroundColor:
Expand All @@ -77,7 +77,7 @@ class ToolBar extends StatelessWidget {
'Add new node',
device,
onPressed: () {
_showNodePicker(context, device,suprovider);
_showNodePicker(context, device, suprovider);
},
backgroundColor:
suprovider.isDark
Expand Down Expand Up @@ -165,7 +165,9 @@ class ToolBar extends StatelessWidget {
provider.currentMode == DrawMode.stickyNote
? Colors.blue
: tertiaryColors[6],
onPressed: () => _showStickyNote(context, device,suprovider),
onPressed:
() =>
_showStickyNote(context, device, suprovider),
backgroundColor:
suprovider.isDark
? Color.fromRGBO(48, 48, 48, 1)
Expand All @@ -186,7 +188,7 @@ class ToolBar extends StatelessWidget {
context,
provider,
device,
suprovider
suprovider,
); // Pass the provider
},
backgroundColor:
Expand All @@ -202,7 +204,7 @@ class ToolBar extends StatelessWidget {
'Add new node',
device,
onPressed: () {
_showNodePicker(context, device,suprovider);
_showNodePicker(context, device, suprovider);
},
backgroundColor:
suprovider.isDark
Expand All @@ -214,7 +216,7 @@ class ToolBar extends StatelessWidget {
_horizontalDivider(device),
_toolIcon(
PhosphorIconsRegular.cursor,
'Pointer',
'Pointer\nPress P',
device,
iconColor:
provider.currentMode == DrawMode.pointer
Expand All @@ -233,7 +235,7 @@ class ToolBar extends StatelessWidget {
_horizontalDivider(device),
_toolIcon(
PhosphorIconsRegular.handGrabbing,
'Pan',
'Pan\nPress A',
device,
iconColor:
provider.currentMode == DrawMode.hand
Expand All @@ -252,7 +254,7 @@ class ToolBar extends StatelessWidget {
_horizontalDivider(device),
_toolIcon(
PhosphorIconsRegular.textT,
'Text box',
'Text box\nPress T',
device,
iconColor:
provider.currentMode == DrawMode.textBox
Expand Down Expand Up @@ -284,13 +286,14 @@ class ToolBar extends StatelessWidget {
_horizontalDivider(device),
_toolIcon(
PhosphorIconsFill.noteBlank,
'Add new sticky note',
'Add new sticky note\nPress S',
device,
iconColor:
provider.currentMode == DrawMode.stickyNote
? Colors.blue
: tertiaryColors[6],
onPressed: () => _showStickyNote(context, device,suprovider),
onPressed:
() => _showStickyNote(context, device, suprovider),
backgroundColor:
suprovider.isDark
? Color.fromRGBO(48, 48, 48, 1)
Expand Down Expand Up @@ -346,7 +349,11 @@ class ToolBar extends StatelessWidget {
);
}

void _showNodePicker(BuildContext context, rh.DeviceType device,SupabaseService su) {
void _showNodePicker(
BuildContext context,
rh.DeviceType device,
SupabaseService su,
) {
final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
if (renderBox == null) return;

Expand Down Expand Up @@ -385,7 +392,7 @@ class ToolBar extends StatelessWidget {
left: leftPos,
child: Material(
color: Colors.transparent,
child: NodePicker(su: su,),
child: NodePicker(su: su),
),
),
],
Expand All @@ -398,7 +405,7 @@ class ToolBar extends StatelessWidget {
BuildContext context,
WorkspaceProvider provider,
rh.DeviceType device,
SupabaseService su
SupabaseService su,
) {
final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
if (renderBox != null) {
Expand Down Expand Up @@ -448,7 +455,11 @@ class ToolBar extends StatelessWidget {
}
}

void _showStickyNote(BuildContext context, rh.DeviceType device,SupabaseService su) {
void _showStickyNote(
BuildContext context,
rh.DeviceType device,
SupabaseService su,
) {
final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
if (renderBox != null) {
final position = renderBox.localToGlobal(Offset.zero);
Expand All @@ -465,7 +476,7 @@ class ToolBar extends StatelessWidget {
),
),
Positioned(
right:device == rh.DeviceType.mobile ? position.dx : 150.w ,
right: device == rh.DeviceType.mobile ? position.dx : 150.w,
top:
device == rh.DeviceType.desktop
? 500.h
Expand All @@ -474,7 +485,7 @@ class ToolBar extends StatelessWidget {
: position.dy - 390.h,
child: Material(
color: Colors.transparent,
child: StickyNotesWidget(su: su,),
child: StickyNotesWidget(su: su),
),
),
],
Expand Down
21 changes: 16 additions & 5 deletions lib/features/workspace/widgets/zoom_control_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,22 @@ class ZoomControlButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final device = rh.ResponsiveLayoutHelper.getDeviceType(context);
return Consumer2<CanvasProvider,SupabaseService>(
builder: (context, canvasProvider,suprovider, child) {
return Consumer2<CanvasProvider, SupabaseService>(
builder: (context, canvasProvider, suprovider, child) {
return Container(
padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 16.h),
decoration: BoxDecoration(
border: Border.all(color:suprovider.isDark ? Color.fromRGBO(75, 75, 75, 1) :const Color(0XFFD9D9D9), width: 1.2),
color:suprovider.isDark ? Color.fromRGBO(48, 48, 48, 1) : Colors.white,
border: Border.all(
color:
suprovider.isDark
? Color.fromRGBO(75, 75, 75, 1)
: const Color(0XFFD9D9D9),
width: 1.2,
),
color:
suprovider.isDark
? Color.fromRGBO(48, 48, 48, 1)
: Colors.white,
borderRadius: BorderRadius.circular(12.r),
),
child: Row(
Expand Down Expand Up @@ -49,6 +58,7 @@ class ZoomControlButton extends StatelessWidget {
VerticalCustomDivider(),
SizedBox(width: 8.w),
IconButton(
tooltip: "Press Z",
onPressed: () {
canvasProvider.zoomIn(); // Call zoomIn method
},
Expand All @@ -67,6 +77,7 @@ class ZoomControlButton extends StatelessWidget {
VerticalCustomDivider(),
SizedBox(width: 8.w),
IconButton(
tooltip: 'Press X',
onPressed: () {
canvasProvider.zoomOut(); // Call zoomOut method
},
Expand Down Expand Up @@ -98,7 +109,7 @@ class ZoomControlButton extends StatelessWidget {
: 60.sp,
), // Icon for reset
visualDensity: VisualDensity.compact,
tooltip: 'Reset Zoom',
tooltip: 'Reset Zoom\nPress R',
),
],
),
Expand Down
Loading